]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 8 Aug 2019 06:44:33 +0000 (08:44 +0200)
committerThibaut Girka <thib@sitedethib.com>
Thu, 8 Aug 2019 06:44:33 +0000 (08:44 +0200)
commitebc0521ba82cfc43094a1aead868c61118767030
treeafc3e03fc60c990e263e9721d3e0c6493d492d8a
parent86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e
parentf51c7c105f1d04520656c1235f8a5f58d256fd0e
Merge branch 'master' into glitch-soc/merge-upstream
app/controllers/admin/dashboard_controller.rb
app/controllers/remote_interaction_controller.rb
app/views/admin/dashboard/index.html.haml
app/views/admin/domain_blocks/new.html.haml
config/locales/en.yml
config/routes.rb
db/schema.rb