Thibaut Girka db200226b8 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…

2018-06-15 20:51:39 +02:00

..

migrate

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-15 20:51:39 +02:00

schema.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-15 20:51:39 +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