You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
core	Port a few public.js changes from upstream, move some code around	6 years ago
flavours	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
packs	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago