You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka ff67385cfb 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		5 years ago
..
avatars/original	add new avatar placeholder missing.png (#6728)	7 years ago
emoji	Updated Twemoji to 12.1.3 (#12342)	5 years ago
headers/original	Optimize public/headers/missing.png (#7084)	7 years ago
ocr/lang-data	Add OCR tool to media editing modal (#11566)	5 years ago
sounds	Add artist, title, and date metadata to boop.{mp3,ogg} (#5531)	7 years ago
500.html	Fix error 500 page	7 years ago
android-chrome-192x192.png	Crush PNGs to reduce overall size (#7954)	7 years ago
apple-touch-icon.png	Crush PNGs to reduce overall size (#7954)	7 years ago
background-cybre.png	…
badge.png	Crush PNGs to reduce overall size (#7954)	7 years ago
browserconfig.xml	New logo (#4306)	8 years ago
clock.js	…
embed.js	Add script to make embedded iframes autosize (#4853)	7 years ago
favicon-dev.ico	Use the "m" version of the logo for favicons (#4345)	8 years ago
favicon.ico	Use the "m" version of the logo for favicons (#4345)	8 years ago
logo-cybre-glitch.gif	…
mask-icon.svg	New logo (#4306)	8 years ago
mstile-150x150.png	Crush PNGs to reduce overall size (#7954)	7 years ago
oops.gif	New error page graphic. Other error page improvements (#5099)	7 years ago
oops.png	Change error graphic to hover-to-play (#10055)	6 years ago
riot-glitch.png	…
robots.txt	Disallow robots from indexing /interact/ (#10666)	6 years ago
sw.js	fix #4356 : place sw.js to assets/sw.js (#4357)	8 years ago
web-push-icon_expand.png	Crush PNGs to reduce overall size (#7954)	7 years ago
web-push-icon_favourite.png	Crush PNGs to reduce overall size (#7954)	7 years ago
web-push-icon_reblog.png	Use consistent icons for web push notifications, same as web UI (#4426)	8 years ago