]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 10 Apr 2019 07:16:08 +0000 (09:16 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 10 Apr 2019 07:16:08 +0000 (09:16 +0200)
commit5085559b15ef1c1fe3742757d00e5651fc52b5b5
tree0249b98caced1e39387564f04391eb1a0c39a2d7
parentcb410f80a40d03b509cec244b0cdd4ed3957c6a0
parent830c2a9ccbe98e145640e12637ef3da56f41a7b5
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
18 files changed:
Gemfile.lock
app/controllers/about_controller.rb
app/controllers/auth/registrations_controller.rb
app/controllers/settings/preferences_controller.rb
app/helpers/application_helper.rb
app/models/form/admin_settings.rb
app/models/user.rb
app/views/admin/pending_accounts/index.html.haml
app/views/settings/preferences/show.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
config/locales/simple_form.en.yml
config/navigation.rb
config/routes.rb
config/settings.yml
db/schema.rb
lib/mastodon/version.rb