Swiftzerr 4cd7e9729f Merge branch 'develop' of https://github.com/Swiftzerr/Cider ... Conflicts: .gitignore src/i18n/README.md src/i18n/en_OWO.jsonc src/i18n/en_PISS.jsonc src/i18n/en_SGA.jsonc src/i18n/en_US.jsonc src/i18n/ja_JP.jsonc src/i18n/ko_KR.jsonc src/i18n/zh_CN.jsonc src/i18n/zh_HK.jsonc src/i18n/zh_TW.jsonc src/i18n/zh_yue.jsonc src/main/base/app.ts src/main/base/browserwindow.ts src/main/base/store.ts src/main/base/utils.ts src/main/plugins/thumbar.ts src/renderer/audio/audio.js src/renderer/index.js src/renderer/style.less src/renderer/views/app/chrome-top.ejs src/renderer/views/pages/settings.ejs		2022-02-07 21:18:29 -05:00
..
config.yml	Merge branch 'develop' of https://github.com/Swiftzerr/Cider	2022-02-07 21:18:29 -05:00