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

cab00959

Commit cab00959 authored 3 years ago by eris

Downloads
- Plain Diff

Merge branch 'develop' into 'showMobileNewPost'

# Conflicts:
#   CHANGELOG.md
#   src/App.js

parents 4639e30c 338134ac

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
src/App.js 3 additions, 0 deletions

src/App.js
src/App.vue 1 addition, 1 deletion

src/App.vue
src/components/settings_modal/tabs/general_tab.js 1 addition, 0 deletions

src/components/settings_modal/tabs/general_tab.js
src/components/settings_modal/tabs/general_tab.vue 5 additions, 0 deletions

src/components/settings_modal/tabs/general_tab.vue
src/i18n/en.json 1 addition, 0 deletions

src/i18n/en.json
src/modules/config.js 1 addition, 0 deletions

src/modules/config.js

with 13 additions and 1 deletion

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