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	add new avatar placeholder missing.png (#6728)	2018-03-11 14:55:38 +01:00
emoji	update twemojie to v2 (#7911)	2018-07-06 01:58:07 +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	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	All cybrespace changes through 5/28	2017-06-23 21:45:14 +00:00
badge.png	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02:00
browserconfig.xml	New logo (#4306)	2017-07-23 02:40:39 +02:00
clock.js	cybrespace to 1.4.2	2017-06-23 21:45:14 +00:00
embed.js	Add script to make embedded iframes autosize (#4853)	2017-09-09 16:23:44 +02:00
favicon-dev.ico	Use the "m" version of the logo for favicons (#4345)	2017-07-24 19:54:59 +02:00
favicon.ico	Use the "m" version of the logo for favicons (#4345)	2017-07-24 19:54:59 +02:00
logo-cybre-glitch.gif	All cybrespace changes through 5/28	2017-06-23 21:45:14 +00:00
mask-icon.svg	New logo (#4306)	2017-07-23 02:40:39 +02:00
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	cybrespace to 1.4.2	2017-06-23 21:45:14 +00:00
robots.txt	Disallow robots from indexing /interact/ (#10666)	2019-05-02 00:10:19 +02:00
sw.js	fix #4356 : place sw.js to assets/sw.js (#4357)	2017-07-28 01:55:52 +02:00
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	Use consistent icons for web push notifications, same as web UI (#4426)	2017-07-28 18:13:42 +02:00