fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 23:55:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka aae60a2366 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
2020-06-24 15:33:41 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
flavours Simplify filtering condition 2020-06-23 16:09:36 +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-06-24 15:33:41 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-06-24 15:33:41 +02:00