mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00

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.