David Yip 3ab6a8b8be Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: spec/views/about/show.html.haml_spec.rb		2018-04-04 13:56:58 -05:00
..
core
flavours	Merge pull request #412 from ThibG/glitch-soc/cleanup	2018-04-04 11:36:54 -04: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-04 13:56:58 -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 'origin/master' into gs-master	2018-04-04 13:56:58 -05:00