Merge branch 'release-5.19' into develop

hirokiterashima · hirokiterashima · commit 3c05f44f15ec · 2020-11-23T14:00:25.000-08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.18.4",
+  "version": "5.19.0",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "browserslist": [
diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.18.4</version>
+  <version>5.19.0</version>
   <url>http://wise5.org</url>
   <licenses>
     <license>
diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt
@@ -1 +1 @@
-5.18.4
+5.19.0

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "wise",`
`3`		`- "version": "5.18.4",`
	`3`	`+ "version": "5.19.0",`
`4`	`4`	`"description": "Web-based Inquiry Science Environment",`
`5`	`5`	`"main": "app.js",`
`6`	`6`	`"browserslist": [`