tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
76b8ae044d7994dc7c906be6a8d853f10afb591b
Mastodon/app/models/user.rb
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00

10 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink