Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.		2018-08-18 18:04:49 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
flavours	Various minor upload description fixes	2018-08-18 17:53:20 +02:00
fonts
images	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
locales
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
skins	Port Sylvhem's mastodon-light to glitch flavour	2018-05-07 17:00:02 +02:00
styles	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00