This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/public
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
..
avatars/original
emoji Fix light-mode emoji borders. (#18131) 2022-04-29 19:23:03 +02:00
headers/original
ocr/lang-data
sounds
500.html
background-cybre.png
badge.png Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
clock.js
embed.js fix: embed.js doesn't expands iframes height (#18301) 2022-05-04 03:20:44 +02:00
favicon.ico Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
inert.css
logo-cybre-glitch.gif
oops.gif
oops.png
riot-glitch.png
robots.txt
sw.js
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png