glitchier-soc/db
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
..
migrate Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
schema.rb Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +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