Thibaut Girka 5f1bdca4c8 Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream ... Merge upstream changes right before the public profile redesign.		2018-07-30 14:39:06 +02:00
..
core	Avoid loading rails-ujs twice on vanilla flavour	2018-07-16 16:42:52 +02:00
flavours	Don't reset scroll position when opening a modal	2018-07-30 14:32:02 +02:00
fonts	Theme: Windows 95	2017-10-26 23:22:48 -07:00
images	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
locales
mastodon	Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream	2018-07-30 14:39:06 +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-26 21:22:43 +02:00