Thibaut Girka a95f8271be Revert some glitch-specific refactoring ... In order to keep my sanity when porting changes between glitch-soc and upstream.		2018-04-19 11:16:18 +02:00
..
core	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
flavours	Revert some glitch-specific refactoring	2018-04-19 11:16:18 +02:00
fonts	…
images	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
locales	…
mastodon	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-18 18:48:12 -05:00
packs	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-25 15:17:21 +00:00
skins/vanilla/win95	…
styles	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-19 01:17:38 +00:00