David Yip 26f770cf72 Merge remote-tracking branch 'glitchsoc/master' into gs-master ... Conflicts: db/schema.rb		2018-04-14 03:50:31 -05:00
..
migrate	Add backend support for bookmarks	2018-04-11 20:40:29 +02:00
schema.rb	Merge remote-tracking branch 'glitchsoc/master' into gs-master	2018-04-14 03:50:31 -05:00
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	2017-06-08 09:22:01 -04:00