]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 23 Mar 2019 21:10:51 +0000 (22:10 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 26 Mar 2019 15:01:59 +0000 (16:01 +0100)
commitfcce135d271276aa38576ed36a113ec3f6161e0a
treef8faef20945cd7f114d8b718c46901fb10fd3c0f
parent9f56511860493b770c2e535be0f8ce4777c8d373
parent9ec98893f4974bb022a722c3163a7e578b1d5ce9
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb

Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
Gemfile
Gemfile.lock
app/models/form/admin_settings.rb
app/models/user.rb
app/presenters/instance_presenter.rb
app/views/admin/settings/edit.html.haml
config/locales/en.yml
config/navigation.rb