Thibaut Girka a96375d2ef Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code		2019-11-20 15:36:09 +01:00
..
avatars/original
emoji	Updated Twemoji to 12.1.3 (#12342)	2019-11-11 00:04:24 +02:00
headers/original
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
android-chrome-192x192.png
apple-touch-icon.png
background-cybre.png
badge.png
browserconfig.xml
clock.js	cybrespace to 1.4.2	2017-06-23 21:45:14 +00:00
embed.js
favicon-dev.ico
favicon.ico
logo-cybre-glitch.gif
mask-icon.svg
mstile-150x150.png
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	fix #4356 : place sw.js to assets/sw.js (#4357)	2017-07-28 01:55:52 +02:00
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png