Merge pull request #276 from support-project/develop

Develop
support-project · Feb 7, 2016 · f96c07c · f96c07c
2 parents c1edee7 + 781d9ed
commit f96c07c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.support-project</groupId>
 	<artifactId>knowledge</artifactId>
 	<packaging>war</packaging>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.0</version>
 	<name>webapp for knowledge</name>
 	<url>https://support-project.org/</url>
 
@@ -16,13 +16,13 @@
 		<dependency>
 			<groupId>org.support-project</groupId>
 			<artifactId>web</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.support-project</groupId>
 			<artifactId>markedj</artifactId>
-			<version>1.0.6-SNAPSHOT</version>
+			<version>1.0.6</version>
 		</dependency>
 
 		<dependency>

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
@@ -55,7 +55,7 @@ message.allready.started=Allready started.
 message.confirm.delete=Are you sure you want to delete?
 
 # Common Label
-label.version=v1.0.0
+label.version=v1.1.0
 label.login=Sign in
 label.previous = Previous
 label.next=Next

diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
@@ -55,7 +55,7 @@ message.allready.started=すでに開始済です
 message.confirm.delete=本当に削除しますか?
 
 # Common Label
-label.version=v1.0.0
+label.version=v1.1.0
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ