fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 06:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
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
..
core Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
flavours Refactor notifications cleaning mode 2020-01-26 14:55:03 +01:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00