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	…
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	…
skins	…
styles	…