okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
orchard/resources
History
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
..
icons Revert "Develop > main" 2022-02-05 09:34:33 +00:00
afterPack.js move macos build files to resources, fix date for i18n 2022-01-25 21:16:36 +07:00
appendCommitToVersion.js unbork unbork bonk 2022-02-07 18:08:59 -08:00
banner.png switched the banner on upcoming to match main 2022-01-27 13:30:30 +03:00
entitlements.mac.plist move macos build files to resources, fix date for i18n 2022-01-25 21:16:36 +07:00
lfmApiCredentials.json fix lastfm 2022-01-21 11:34:19 +07:00
notarize.js move macos build files to resources, fix date for i18n 2022-01-25 21:16:36 +07:00