]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 14 Mar 2019 16:14:05 +0000 (17:14 +0100)
committerThibaut Girka <thib@sitedethib.com>
Thu, 14 Mar 2019 16:17:20 +0000 (17:17 +0100)
commit07eb31eeacc4e0364b839233a41fa65eb3c650ce
tree843cda5a4d9bc730aba9a13d0634fef5e2212515
parentfa75324059c7a146354470691888dc0e1de0342f
parent874bd3ac0c56e2d2901785e170b27f5cde32b33b
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.
24 files changed:
Gemfile.lock
app/controllers/accounts_controller.rb
app/controllers/admin/settings_controller.rb
app/controllers/auth/registrations_controller.rb
app/helpers/application_helper.rb
app/javascript/styles/mastodon/admin.scss
app/models/account.rb
app/models/form/admin_settings.rb
app/models/user.rb
app/presenters/instance_presenter.rb
app/serializers/rest/instance_serializer.rb
app/views/admin/settings/edit.html.haml
app/views/layouts/public.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/ja.yml
config/locales/oc.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/routes.rb
config/settings.yml
db/schema.rb
spec/presenters/instance_presenter_spec.rb