mastodon/app/javascript/flavours
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
2019-02-17 12:26:55 +01:00
..
glitch Fix style regressions on landing page (#10030) 2019-02-15 18:22:06 +01:00
vanilla Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00