chuckya/app/views/layouts
Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/follower_domains_controller.rb
  Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
  Upstream removed the “Authorized followers” page and associated
  translations. This is too close in the file to our glitch-soc-specific
  “flavour” string. No actual conflict.
- config/locales/ja.yml
  Same as above.
- config/locales/pl.yml
  Same as above.
- config/navigation.rb
  No real conflict. New route added too close to the glitch-soc-specific
  “flavours” one.
- config/webpack/configuration.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpack/loaders/babel.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
  The contents of this file have been moved to package.json.
- config/webpack/shared.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpacker.yml
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- jest.config.js
  The contents of this file have been moved to package.json.
- package.json
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- yarn.lock
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
2019-03-16 14:14:20 +01: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 commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream 2018-10-11 14:12:36 +02:00
auth.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01: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-03-16 14:14:20 +01: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-03-16 14:14:20 +01:00