me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/views/layouts
History
Thibaut Girka 4973ba2d1f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
..
_theme.html.haml Various fixes 2017-12-04 21:58:10 -08:00
admin.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
application.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
auth.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
embedded.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
error.html.haml Fix static error page to use the correct pack 2019-02-17 13:34:40 +01:00
mailer.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
mailer.text.erb Replace tutorial modal with welcome e-mail (#6273) 2018-01-18 19:17:25 +01:00
modal.html.haml Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
plain_mailer.html.haml HTML e-mails for UserMailer (#6256) 2018-01-16 03:29:11 +01:00
public.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00