Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
avatars/original
emoji	update twemojie to v2 (#7911)	2018-07-06 01:58:07 +02:00
headers/original
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	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
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
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