kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
				
				
				
			fix: resolve merge errors
							rodzic
							
								
									2db8c585ad
								
							
						
					
					
						commit
						ef6da257f2
					
				|  | @ -17,8 +17,8 @@ | |||
|     "postinstall": "yarn run fix-fomantic-css" | ||||
|   }, | ||||
|   "dependencies": { | ||||
|     "@sentry/tracing": "7.47.0", | ||||
|     "@sentry/vue": "7.47.0", | ||||
|     "@sentry/tracing": "7.27.0", | ||||
|     "@sentry/vue": "7.27.0", | ||||
|     "@vue/runtime-core": "3.2.45", | ||||
|     "@vueuse/core": "9.12.0", | ||||
|     "@vueuse/integrations": "9.12.0", | ||||
|  | @ -29,9 +29,9 @@ | |||
|     "butterchurn": "3.0.0-beta.4", | ||||
|     "butterchurn-presets": "3.0.0-beta.4", | ||||
|     "diff": "5.1.0", | ||||
|     "dompurify": "2.4.5", | ||||
|     "dompurify": "2.4.3", | ||||
|     "focus-trap": "7.2.0", | ||||
|     "fomantic-ui-css": "2.9.2", | ||||
|     "fomantic-ui-css": "2.9.1", | ||||
|     "howler": "2.2.3", | ||||
|     "idb-keyval": "6.2.0", | ||||
|     "js-logger": "1.6.1", | ||||
|  | @ -39,7 +39,7 @@ | |||
|     "lru-cache": "7.14.1", | ||||
|     "moment": "2.29.4", | ||||
|     "showdown": "2.1.0", | ||||
|     "standardized-audio-context": "25.3.41", | ||||
|     "standardized-audio-context": "25.3.37", | ||||
|     "text-clipper": "2.2.0", | ||||
|     "transliteration": "2.3.5", | ||||
|     "universal-cookie": "4.0.4", | ||||
|  | @ -59,11 +59,11 @@ | |||
|   "devDependencies": { | ||||
|     "@intlify/eslint-plugin-vue-i18n": "2.0.0", | ||||
|     "@intlify/unplugin-vue-i18n": "0.8.2", | ||||
|     "@types/diff": "5.0.3", | ||||
|     "@types/diff": "5.0.2", | ||||
|     "@types/dompurify": "2.4.0", | ||||
|     "@types/howler": "2.2.7", | ||||
|     "@types/jquery": "3.5.16", | ||||
|     "@types/lodash-es": "4.17.7", | ||||
|     "@types/lodash-es": "4.17.6", | ||||
|     "@types/moxios": "0.4.15", | ||||
|     "@types/qs": "6.9.7", | ||||
|     "@types/semantic-ui": "2.2.7", | ||||
|  | @ -88,16 +88,13 @@ | |||
|     "eslint-plugin-vue": "9.8.0", | ||||
|     "jsdom": "20.0.3", | ||||
|     "jsonc-eslint-parser": "2.1.0", | ||||
|     "moxios": "0.4.0", | ||||
|     "rollup-plugin-visualizer": "5.9.0", | ||||
|     "sass": "1.57.1", | ||||
|     "sinon": "15.0.2", | ||||
|     "typescript": "4.9.5", | ||||
|     "sinon": "15.0.1", | ||||
|     "standardized-audio-context-mock": "9.6.18", | ||||
|     "typescript": "4.9.4", | ||||
|     "utility-types": "3.10.0", | ||||
|     "vite": "4.0.4", | ||||
|     "vite-plugin-pwa": "0.14.4", | ||||
|     "vite-plugin-vue-inspector": "1.1.4", | ||||
|     "standardized-audio-context-mock": "9.6.18", | ||||
|     "vite-plugin-pwa": "0.14.1", | ||||
|     "vitest": "0.25.8", | ||||
|     "vue-tsc": "1.0.24", | ||||
|     "workbox-core": "6.5.4", | ||||
|  |  | |||
		Ładowanie…
	
		Reference in New Issue
	
	 Kasper Seweryn
						Kasper Seweryn