David Yip 7600067a30 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb db/schema.rb		2018-05-04 14:16:30 -05:00
..
migrate	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-04 14:16:30 -05:00
schema.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-04 14:16:30 -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