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 3d6c594903 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…		7 years ago
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	8 years ago