glitchier-soc/db
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
2018-05-11 18:12:42 +02:00
..
migrate Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
schema.rb Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +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