tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
bde9196b70299405ebe9b16500b7a3f65539b2c3
Mastodon/app/models/user.rb
Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.
2019-03-14 17:17:20 +01:00

9.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink