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 7b435fd9bf Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
2020-03-27 21:54:44 +01:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
flavours [Glitch] Fix frontend crash when deleting announcements 2020-03-22 16:31:01 +01:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00