Thibaut Girka 24968d20a0 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

…

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

…

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

…

modal.html.haml

…

plain_mailer.html.haml

…

public.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-30 12:22:33 +02:00