fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-30 20:27:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.
2020-09-07 09:21:38 +02:00
..
core Adapt 2FA changes to glitch-soc's theming system 2020-08-30 17:26:18 +02:00
flavours [Glitch] Update Tesseract.js 2020-09-01 17:10:20 +02:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +02:00
packs Adapt 2FA changes to glitch-soc's theming system 2020-08-30 17:26:18 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +02:00