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
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
..
avatars/original
emoji
headers/original
sounds
500.html
android-chrome-192x192.png
apple-touch-icon.png
background-cybre.png
badge.png
browserconfig.xml
clock.js
embed.js
favicon-dev.ico
favicon.ico
logo-cybre-glitch.gif
mask-icon.svg
mstile-150x150.png
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