tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
3d970faeb1b52c025b0df38bfd91135e778834e8
Mastodon/app/models/account.rb
Thibaut Girka e71b16ae2b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies.
2020-11-25 15:31:45 +01:00

18 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink