tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d37a79adcecd04106d21d2672db68c2a9dac1517
Mastodon/app/models/account.rb
David Yip f61aa8e0f7 Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/javascript/styles/mastodon/components.scss
 	app/models/media_attachment.rb
2018-03-27 10:26:47 -05:00

13 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink