Thibaut Girka 4f4908311d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		2018-08-27 18:09:28 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
flavours	Update poylfills (fixes #662)	2018-08-23 22:58:25 +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-27 18:09:28 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
skins
styles	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00