tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/core
History
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
2020-12-15 14:27:06 +01:00
..
admin.js
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-15 14:27:06 +01:00
auth.js
[Glitch] Change how CDN_HOST is passed down to make assets build reproducible
2020-10-21 21:28:47 +02:00
common.js
[Glitch] Change how CDN_HOST is passed down to make assets build reproducible
2020-10-21 21:28:47 +02:00
embed.js
[Glitch] Change how CDN_HOST is passed down to make assets build reproducible
2020-10-21 21:28:47 +02:00
mailer.js
…
public.js
[Glitch] Change how CDN_HOST is passed down to make assets build reproducible
2020-10-21 21:28:47 +02:00
settings.js
[Glitch] Change how CDN_HOST is passed down to make assets build reproducible
2020-10-21 21:28:47 +02:00
theme.yml
Adapt 2FA changes to glitch-soc's theming system
2020-08-30 17:26:18 +02:00
two_factor_authentication.js
[Glitch] Change how CDN_HOST is passed down to make assets build reproducible
2020-10-21 21:28:47 +02:00