djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-14 11:43:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/views/directories
History
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
..
index.html.haml
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-27 15:46:50 +01:00