imncls bb6988a7ac

Merge branch 'master' of https://github.com/tootsuite/mastodon ...

# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb

2018-02-23 23:28:31 +09:00

..

migrate

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

schema.rb

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

seeds.rb

Fix db:seed - only run some validations when the field was changed (#3592)

2017-06-08 09:22:01 -04:00