tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
c14f59c542accd44a12c30b50f8ccca6730fd1b7
Mastodon/app/models/media_attachment.rb
David Yip 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00

5.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink