David Yip 130aa90d55 Update annotations on Follow, FollowRequest, and Mute. ... Follow and FollowRequest had conflicts in their schema annotations, so I ran latest migrations and let annotate_models fix them up.		2017-11-17 17:41:15 -06:00
..
migrate	Merge remote-tracking branch 'origin/master' into merge-upstream	2017-11-17 17:40:00 -06:00
schema.rb	Update annotations on Follow, FollowRequest, and Mute.	2017-11-17 17:41:15 -06:00
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	2017-06-08 09:22:01 -04:00