]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 6 Aug 2019 11:16:53 +0000 (13:16 +0200)
committerThibaut Girka <thib@sitedethib.com>
Tue, 6 Aug 2019 11:16:53 +0000 (13:16 +0200)
commitcad2e6eb7afe96f781175cd829b70a0667d3498a
tree7efda6a7ca7dbe62d6efa42b17c1167e751c44d3
parent3ea7a334d89d2c4075b1dbf649d692ff49325f2e
parent1d8d553d8b5cb23cc67bd530ca9eb70a6683ab2a
Merge branch 'master' into glitch-soc/merge-upstream
app/controllers/admin/dashboard_controller.rb
app/controllers/settings/preferences_controller.rb
app/models/user.rb
app/views/admin/dashboard/index.html.haml
config/locales/en.yml
config/locales/simple_form.en.yml
config/navigation.rb
config/routes.rb
config/settings.yml
db/schema.rb