]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 17 Feb 2019 10:58:17 +0000 (11:58 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sun, 17 Feb 2019 11:26:55 +0000 (12:26 +0100)
commit369a475a7001677493b452b9aaea1141de442c53
treea0c81f0876c68827cfa0e856844054e53cb2e741
parentab9082b3325dfd193d7130d6c880e85ab2781bc0
parent147b4c2c3afacd6ad9d5c1353c072861eaca5fd2
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.
app/javascript/flavours/vanilla/theme.yml
app/serializers/rest/instance_serializer.rb
app/views/layouts/error.html.haml