mastodon-glitch/public
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
..
avatars/original add new avatar placeholder missing.png (#6728) 2018-03-11 14:55:38 +01:00
emoji Add border around 🕺 emoji (#14769) 2020-09-10 19:08:03 +02:00
headers/original Optimize public/headers/missing.png (#7084) 2018-04-09 11:34:48 +02:00
ocr/lang-data Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
shortcuts Add app shortcuts (#15234) 2020-12-15 02:04:56 +01:00
sounds Add artist, title, and date metadata to boop.{mp3,ogg} (#5531) 2017-10-28 00:05:04 +09:00
500.html Fix error 500 page 2018-03-16 22:31:20 +01:00
android-chrome-192x192.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
apple-touch-icon.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
background-cybre.png
badge.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
browserconfig.xml
clock.js
embed.js
favicon-dev.ico
favicon.ico
inert.css Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679) 2020-05-08 21:22:57 +02:00
logo-cybre-glitch.gif
mask-icon.svg
mstile-150x150.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
oops.gif New error page graphic. Other error page improvements (#5099) 2017-09-25 23:05:54 +02:00
oops.png Change error graphic to hover-to-play (#10055) 2019-02-15 23:33:25 +01:00
riot-glitch.png
robots.txt Disallow robots from indexing /interact/ (#10666) 2019-05-02 00:10:19 +02:00
sw.js
web-push-icon_expand.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
web-push-icon_favourite.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
web-push-icon_reblog.png