mastodon/app/javascript/flavours/vanilla
Thibaut Girka da24c6aced 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
..
names.yml fix typo in vanilla names.yml 2018-01-06 16:49:53 -05:00
theme.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00