tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b0139dcf5e4ba3fa0e3ba10c40dbe7931fdb0824
Mastodon/Gemfile
Thibaut Girka c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
2020-01-27 15:46:50 +01:00

4.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink