Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

2019-06-10 18:59:53 +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-06-10 18:59:53 +02:00