tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
071c2c9c853b7d91127a7c44ec3c71830e0dcb20
Mastodon/app/models/user.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

6.3 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink