Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
		
						commit
						eb745d2aa0
					
				
					 2 changed files with 11 additions and 11 deletions
				
			
		|  | @ -35,7 +35,7 @@ | ||||||
| 		"lodash": "^4.17.20" | 		"lodash": "^4.17.20" | ||||||
| 	}, | 	}, | ||||||
| 	"dependencies": { | 	"dependencies": { | ||||||
| 		"@babel/plugin-transform-runtime": "7.13.6", | 		"@babel/plugin-transform-runtime": "7.13.9", | ||||||
| 		"@elastic/elasticsearch": "7.11.0", | 		"@elastic/elasticsearch": "7.11.0", | ||||||
| 		"@fortawesome/fontawesome-svg-core": "1.2.34", | 		"@fortawesome/fontawesome-svg-core": "1.2.34", | ||||||
| 		"@fortawesome/free-brands-svg-icons": "5.15.2", | 		"@fortawesome/free-brands-svg-icons": "5.15.2", | ||||||
|  | @ -251,7 +251,7 @@ | ||||||
| 		"vue-loader": "16.1.2", | 		"vue-loader": "16.1.2", | ||||||
| 		"vue-prism-editor": "2.0.0-alpha.2", | 		"vue-prism-editor": "2.0.0-alpha.2", | ||||||
| 		"vue-router": "4.0.4", | 		"vue-router": "4.0.4", | ||||||
| 		"vue-style-loader": "4.1.2", | 		"vue-style-loader": "4.1.3", | ||||||
| 		"vuedraggable": "4.0.1", | 		"vuedraggable": "4.0.1", | ||||||
| 		"web-push": "3.4.4", | 		"web-push": "3.4.4", | ||||||
| 		"webpack": "5.24.2", | 		"webpack": "5.24.2", | ||||||
|  |  | ||||||
							
								
								
									
										18
									
								
								yarn.lock
									
										
									
									
									
								
							
							
						
						
									
										18
									
								
								yarn.lock
									
										
									
									
									
								
							|  | @ -123,17 +123,17 @@ | ||||||
|   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.4.tgz#340211b0da94a351a6f10e63671fa727333d13ab" |   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.4.tgz#340211b0da94a351a6f10e63671fa727333d13ab" | ||||||
|   integrity sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA== |   integrity sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA== | ||||||
| 
 | 
 | ||||||
| "@babel/plugin-transform-runtime@7.13.6": | "@babel/plugin-transform-runtime@7.13.9": | ||||||
|   version "7.13.6" |   version "7.13.9" | ||||||
|   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.6.tgz#c11c806f023d2065bbcc9b751702f4008245951c" |   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.9.tgz#744d3103338a0d6c90dee0497558150b490cee07" | ||||||
|   integrity sha512-QsTomUTIeOdYrNsOMJRSp2QzGvB1KYD4ePCC8Mei2SuoHScncYS3h1E9PR5gDL7buJmcqIHrWyH6B5GZMgDrRg== |   integrity sha512-XCxkY/wBI6M6Jj2mlWxkmqbKPweRanszWbF3Tyut+hKh+PHcuIH/rSr/7lmmE7C3WW+HSIm2GT+d5jwmheuB0g== | ||||||
|   dependencies: |   dependencies: | ||||||
|     "@babel/helper-module-imports" "^7.12.13" |     "@babel/helper-module-imports" "^7.12.13" | ||||||
|     "@babel/helper-plugin-utils" "^7.13.0" |     "@babel/helper-plugin-utils" "^7.13.0" | ||||||
|     babel-plugin-polyfill-corejs2 "^0.1.4" |     babel-plugin-polyfill-corejs2 "^0.1.4" | ||||||
|     babel-plugin-polyfill-corejs3 "^0.1.3" |     babel-plugin-polyfill-corejs3 "^0.1.3" | ||||||
|     babel-plugin-polyfill-regenerator "^0.1.2" |     babel-plugin-polyfill-regenerator "^0.1.2" | ||||||
|     semver "7.0.0" |     semver "^6.3.0" | ||||||
| 
 | 
 | ||||||
| "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2": | "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2": | ||||||
|   version "7.12.13" |   version "7.12.13" | ||||||
|  | @ -10972,10 +10972,10 @@ vue-router@4.0.4: | ||||||
|   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.4.tgz#ad9b4b7bbdad622407b4ff189b1646f48c1e9053" |   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.4.tgz#ad9b4b7bbdad622407b4ff189b1646f48c1e9053" | ||||||
|   integrity sha512-uN6PDEaYdU9aRO7mU+Dkr1uaY49hV3fucEDG/Vre/Qj8ct3RoJS16vcPrvKVzn69zDDjBV5b9Xw7fZA9r6b/Iw== |   integrity sha512-uN6PDEaYdU9aRO7mU+Dkr1uaY49hV3fucEDG/Vre/Qj8ct3RoJS16vcPrvKVzn69zDDjBV5b9Xw7fZA9r6b/Iw== | ||||||
| 
 | 
 | ||||||
| vue-style-loader@4.1.2: | vue-style-loader@4.1.3: | ||||||
|   version "4.1.2" |   version "4.1.3" | ||||||
|   resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8" |   resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35" | ||||||
|   integrity sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ== |   integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg== | ||||||
|   dependencies: |   dependencies: | ||||||
|     hash-sum "^1.0.2" |     hash-sum "^1.0.2" | ||||||
|     loader-utils "^1.0.2" |     loader-utils "^1.0.2" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue