mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 13:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/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