]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 9 Dec 2018 12:28:09 +0000 (13:28 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sun, 9 Dec 2018 15:08:04 +0000 (16:08 +0100)
commite7f1bfdc2d528f137299ba0c3ab2a30f2f91f53c
tree2693ffce4d340a9b77a7ca52c856aaae7af8c913
parente3682c9c1750e5e7e5d2f817e29f6760a18400ca
parent81bda7d67c984c9bfcb5bca94e50cec6405b492e
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
21 files changed:
Gemfile.lock
app/controllers/settings/preferences_controller.rb
app/controllers/settings/profiles_controller.rb
app/javascript/core/settings.js
app/javascript/styles/mastodon/components.scss
app/lib/feed_manager.rb
app/lib/user_settings_decorator.rb
app/models/account.rb
app/models/concerns/account_associations.rb
app/models/user.rb
app/views/layouts/public.html.haml
app/views/settings/preferences/show.html.haml
app/views/settings/profiles/show.html.haml
config/locales/en.yml
config/locales/pl.yml
config/locales/simple_form.en.yml
config/locales/simple_form.pl.yml
config/navigation.rb
config/routes.rb
config/settings.yml
db/schema.rb