Thibaut Girka 8bd7b9b586 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
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	2017-06-08 09:22:01 -04:00