Skip to content

Commit

Permalink
Merge pull request #991 from support-project/develop
Browse files Browse the repository at this point in the history
Release v1.12.0
  • Loading branch information
koda-masaru authored Jan 8, 2018
2 parents 387b714 + 1329aa6 commit 327fc75
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.support-project</groupId>
<artifactId>knowledge</artifactId>
<version>1.12.0-SNAPSHOT</version>
<version>1.12.0</version>
<packaging>war</packaging>

<name>knowledge</name>
Expand Down Expand Up @@ -61,12 +61,12 @@
<dependency>
<groupId>org.support-project</groupId>
<artifactId>web</artifactId>
<version>1.12.0-SNAPSHOT</version>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.support-project</groupId>
<artifactId>markedj</artifactId>
<version>1.7.0-SNAPSHOT</version>
<version>1.7.0</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/appresource.properties
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ message.allready.started=Already started.
message.confirm.delete=Are you sure you want to delete?

# Common Label
label.version=v1.12.0 pre1
label.version=v1.12.0
label.login=Sign in
label.previous= Previous
label.next=Next
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/appresource_ja.properties
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ message.allready.started=すでに開始済です
message.confirm.delete=本当に削除しますか?

# Common Label
label.version=v1.12.0 pre1
label.version=v1.12.0
label.login=サインイン
label.previous = 前へ
label.next = 次へ
Expand Down

0 comments on commit 327fc75

Please sign in to comment.