cryptofyre 7f9f9a4f31 Merge branch 'main' of https://github.com/ciderapp/Cider into develop ... # Conflicts: # README.md # src/i18n/es_ES.json		2022-04-24 02:46:14 -05:00
..
__tests__	trying out what circleci support said	2022-02-04 09:52:41 +00:00
i18n	Merge branch 'main' of https://github.com/ciderapp/Cider into develop	2022-04-24 02:46:14 -05:00
main	Fix Web Remote hotkey	2022-04-23 17:35:05 +02:00
preload	mpris fix	2022-03-11 00:26:42 +00:00
renderer	Merge pull request #913 from Amaru8/patch-10	2022-04-24 02:24:04 -05:00
web-remote	optimizations for high dpi artwork	2022-03-23 22:07:53 -07:00