tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
bdc1581556b86ba25a385c9309db714eeaba1ca1
Mastodon/app/models/user.rb
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00

11 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink