luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-07-19 02:26:28 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/core
History
Claire c81d1b0d38 Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
2023-05-09 22:12:05 +02:00
..
admin.js
auth.js
common.js
embed.js
mailer.js Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream 2023-05-09 22:12:05 +02:00
public.js Fix some more Javascript linting issues and discrepancies with upstream (#2209) 2023-05-07 21:43:25 +02:00
settings.js
theme.yml
two_factor_authentication.js