mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
donphan/app/views/admin/dashboard
History
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
 		2019-09-30 12:23:57 +02:00
..
index.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00