Merge branch 'dev'

saqqdy · Mar 24, 2022 · fd1b05b · fd1b05b
2 parents b92704d + 000d956
commit fd1b05b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/www/assets/polyfills-legacy.3c03638d.js → app/www/assets/polyfills-legacy.7082d682.js b/app/www/assets/polyfills-legacy.3c03638d.js → app/www/assets/polyfills-legacy.7082d682.js
diff --git a/app/www/index.html b/app/www/index.html
@@ -61,7 +61,7 @@
 		<div id="box"></div>
 
 		<script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-		<script nomodule id="vite-legacy-polyfill" src="/assets/polyfills-legacy.3c03638d.js"></script>
+		<script nomodule id="vite-legacy-polyfill" src="/assets/polyfills-legacy.7082d682.js"></script>
 		<script nomodule id="vite-legacy-entry" data-src="/assets/index-legacy.d335bbad.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 	</body>
 </html>
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,6 +1,6 @@
 # 更新日志
 
-## 2022.03.20 v2.18.0 更新日志
+## 2022.03.24 v2.18.0 更新日志
 
 1. 新增`gitm alias`指令，初始化：`git alias init`，移除：`git alias remove`
 2. 新增别名指令使用gitmars，可使用`git mars xxx` 或 `git flow xxx`，均等价于`gitm xxx`

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "gitmars",
     "description": "这是一个git工作流工具",
-    "version": "2.18.0-beta.3",
+    "version": "2.18.0",
     "scripts": {
         "docs:dev": "vuepress dev docs",
         "docs:build": "vuepress build docs",