From 5e724cc0628554b949f0102bee6294db8a23c7f5 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期三, 06 七月 2022 15:33:43 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mrjackwang/wvp-GB28181-pro into wvp-28181-2.0

---
 web_src/static/js/jessibuca/decoder.wasm |    0 
 bootstrap.sh                             |    0 
 pom.xml                                  |    4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
old mode 100755
new mode 100644
diff --git a/pom.xml b/pom.xml
index 1209124..76e2db6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,14 +265,14 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
+	<!--		<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
 				<version>3.0.1</version>
 				<configuration>
 					<offline>true</offline>
 				</configuration>
-			</plugin>
+			</plugin>-->
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/web_src/static/js/jessibuca/decoder.wasm b/web_src/static/js/jessibuca/decoder.wasm
old mode 100755
new mode 100644
Binary files differ

--
Gitblit v1.8.0