]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 26 Jun 2019 20:54:09 +0000 (22:54 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 26 Jun 2019 21:19:22 +0000 (23:19 +0200)
commitaaec64a500346502aedefff446f1d8688ac5077c
treeb24b5c7fa4b500b00c85cee3ef2cbb553d763f4d
parent9ef25877dfda12cf31ec586294e4d4908f5be4f0
parent3086c645fde2345d34e401bdf3e2f19f19da3294
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
16 files changed:
Gemfile
Gemfile.lock
app/controllers/application_controller.rb
app/controllers/settings/preferences_controller.rb
app/javascript/mastodon/features/compose/components/compose_form.js
app/javascript/mastodon/initial_state.js
app/lib/feed_manager.rb
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/settings/preferences/appearance/show.html.haml
config/locales/simple_form.en.yml
config/settings.yml
package.json
spec/lib/feed_manager_spec.rb
yarn.lock