tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
e8a9627f6619ca17e68da2d1558806f1965c8425
Mastodon/app/models/concerns/account_interactions.rb
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

6.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink