djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-24 17:14:15 -05:00
Code Issues Packages Projects Releases Wiki Activity
903dc53522
tootlab-mastodon/app/javascript/core
History
Claire 1b06e4e1b7 Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  In glitch-soc, this file was split across the following files:
  - `app/javascript/packs/public.jsx`
  - `app/javascript/core/embed.js`
  - `app/javascript/core/settings.js`
  Update all those files accordingly, as well as the related `theme.yml` files.
2024-03-15 22:37:55 +01:00
..
admin.ts Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream 2024-03-01 13:02:59 +01:00
auth.js
common.js
embed.ts Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 2024-03-15 22:37:55 +01:00
inert.js Remove bypass and use use glitch-soc's theming system for inert.css 2024-01-15 22:16:26 +01:00
mailer.js
remote_interaction_helper.ts
settings.ts Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 2024-03-15 22:37:55 +01:00
theme.yml Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 2024-03-15 22:37:55 +01:00
two_factor_authentication.js