Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		2018-11-27 13:23:02 +01:00
..
extend.rb	Refactor Setting (#3302)	2017-05-25 14:14:36 +02:00
scoped_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00