Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields		2018-06-21 20:49:57 +02:00
..
core	…
flavours	…
fonts	…
images	…
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
packs	…
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00