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

91438627

Commit 91438627 authored 6 years ago by HJ

Downloads
- Plain Diff

Merge branch 'fix/user-settings-switch' into 'develop'

Switch to "timeline" when pressing user-settings

See merge request pleroma/pleroma-fe!397

parents 9591d179 5eced8bf

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/App.vue 1 addition, 1 deletion

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

src/components/user_card_content/user_card_content.js
src/components/user_card_content/user_card_content.vue 1 addition, 1 deletion

src/components/user_card_content/user_card_content.vue
src/components/user_panel/user_panel.js 1 addition, 0 deletions

src/components/user_panel/user_panel.js
src/components/user_panel/user_panel.vue 1 addition, 1 deletion

src/components/user_panel/user_panel.vue

with 5 additions and 4 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