fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-28 03:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/layouts
History
Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
  We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
2022-06-11 00:08:41 +02:00
..
_theme.html.haml Fix missing media: 'all' on default skins 2022-01-16 22:26:18 +01:00
admin.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
application.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
auth.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
embedded.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
error.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
mailer.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
mailer.text.erb
modal.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
plain_mailer.html.haml
public.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00