Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00
parent 6f8ccbfcdf 24cafd73a2
commit 1ab12ba38e
67 changed files with 851 additions and 218 deletions
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -3,6 +3,7 @@
 #
 # Table name: follow_requests
 #
+#  id                :integer          not null, primary key
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
 #  account_id        :bigint          not null