Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master ...

Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.

2020-01-20 15:00:22 +01:00

..

_theme.html.haml

Various fixes

2017-12-04 21:58:10 -08:00

admin.html.haml

Merge branch 'master' into glitch-soc/master

2020-01-20 15:00:22 +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/master

2020-01-20 15:00:22 +01: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-08-19 21:49:35 +02:00