me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/views/admin/dashboard
History
Thibaut Girka 4837d6275a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
..
index.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00