Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.		2020-05-10 16:19:56 +02:00
..
avatars/original
emoji	Update Twemoji to 12.1.5 (#13021)	2020-04-19 23:38:31 +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
sounds
500.html
android-chrome-192x192.png
apple-touch-icon.png	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02:00
background-cybre.png
badge.png
browserconfig.xml	New logo (#4306)	2017-07-23 02:40:39 +02:00
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
oops.gif	New error page graphic. Other error page improvements (#5099)	2017-09-25 23:05:54 +02:00
oops.png
riot-glitch.png	cybrespace to 1.4.2	2017-06-23 21:45:14 +00:00
robots.txt
sw.js
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png	Use consistent icons for web push notifications, same as web UI (#4426)	2017-07-28 18:13:42 +02:00