* upstream/develop: (32 commits)
[Debug] Avoid duplicates in the who to follow panel
updated German translation * added theme settings * added various missing single strings
Fix translation typo in registration.vue
Update README
Fix profiles without statuses not loading
Fix conflicting styles
Remove commented out back button
Cleanup and remove divider element in side drawer
New routes, notifications, other impovements in side drwaer
Add "noAttachmentLinks" to src/modules/instance.js
Make "noAttachmentLinks" configurable
No attachment links
Treat reserved users like external users in the frontend.
User Card Content fixes and updates
scopeCopy → true by default
Restore old routes, enable user route as fallback.
improve web push notifications
fix
Update japanese translation
fix inconsistencies within who_to_follow_panel
...
* upstream/develop: (38 commits)
Feature/bigger icons for mobile / #211
Fix oauth url
clean up the unused stuff
Make user profile page cleaner
missing string and unification with counters (order)
collateral fix for tab display
collateral fixes for user-card: use still-image, styles for custom emoji
Refactor follower/friends out of statuses/timeline into user_profile where it belongs. Changed display of profile to single panel with tabs.
Redirect to /main/all
Move userProfile link to methods
Fix user profile test
Add temporary redirects
Add local profile test
Fix style
Add a way to get new captcha on click
Fix style
Separate captcha into the backendInteractor
more visual fixes
changed bottom-shadow hiding method to be more compatible with overflow
small fix for overflowing tab-switcher
...
* upstream/develop: (24 commits)
Feature/bigger icons for mobile / #211
Fix oauth url
Make user profile page cleaner
Redirect to /main/all
Move userProfile link to methods
Fix user profile test
Add temporary redirects
Add local profile test
Implement user_profile.spec.js
Use babel polyfill in karma
Use 'userProfileLink' to generate user-profile link
Rollback disableDotRule
Use "-1" in indexOf
Add generateProfileLink
Use "~" as a route namespace symbol
Disable dot rule
Pass userName instead of userId
Typo in tests
Fix redirect paths
Fix typo
...
