Thibaut Girka b9d5d8982d Merge branch 'master' into glitch-soc/merge-upstream		2018-07-18 21:54:51 +02:00
..
core	Avoid loading rails-ujs twice on vanilla flavour	2018-07-16 16:42:52 +02:00
flavours	Disable threaded mode when canceling a reply (fixes #583)	2018-07-18 16:42:00 +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-07-18 21:54:51 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-17 22:05:25 +02:00