Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.		2018-09-03 14:33:06 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
flavours	Fixes columns scrolling to top when opening media modal	2018-09-03 14:24:10 +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 branch 'master' into glitch-soc/merge-upstream	2018-09-03 14:33:06 +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-31 19:10:57 +02:00