mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-04 12:34:32 +00:00
369a475a70
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. |
||
---|---|---|
.. | ||
names.yml | ||
theme.yml |