Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn		2018-05-16 21:52:38 +02:00
..
core	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
flavours	Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu	2018-05-16 20:17:08 +02:00
fonts
images
locales
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-16 21:52:38 +02:00
packs	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
skins	Port Sylvhem's mastodon-light to glitch flavour	2018-05-07 17:00:02 +02:00
styles	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00