You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	8 years ago