Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma-fe
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

063b5ba5

Commit 063b5ba5 authored 6 years ago by Shpuld Shpludson

Downloads
- Plain Diff

Merge branch 'revert-886aa35e' into 'develop'

Revert "Merge branch 'feature/split-hide-network' into 'develop'"

See merge request pleroma/pleroma-fe!514

parents c7ee2ed8 d4991d01

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/components/user_settings/user_settings.js 3 additions, 6 deletions

src/components/user_settings/user_settings.js
src/components/user_settings/user_settings.vue 2 additions, 6 deletions

src/components/user_settings/user_settings.vue
src/i18n/de.json 1 addition, 2 deletions

src/i18n/de.json
src/i18n/en.json 1 addition, 2 deletions

src/i18n/en.json
src/i18n/ja.json 1 addition, 2 deletions

src/i18n/ja.json
src/i18n/ko.json 1 addition, 2 deletions

src/i18n/ko.json
src/i18n/ru.json 1 addition, 2 deletions

src/i18n/ru.json
src/services/api/api.service.js 1 addition, 1 deletion

src/services/api/api.service.js
src/services/entity_normalizer/entity_normalizer.service.js 1 addition, 2 deletions

src/services/entity_normalizer/entity_normalizer.service.js

with 12 additions and 25 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment