Skip to content

Commit

Permalink
Merge pull request #219 from aegif/integration
Browse files Browse the repository at this point in the history
Integration
  • Loading branch information
linzhixing authored Jun 21, 2016
2 parents f812f74 + 33824de commit 837b697
Show file tree
Hide file tree
Showing 28 changed files with 1,631 additions and 1,105 deletions.
4 changes: 2 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<groupId>jp.aegif.nemaki</groupId>
<artifactId>core</artifactId>
<packaging>war</packaging>
<version>2.3.13</version>
<version>2.3.15</version>
<name>core</name>
<description>NemakiWare server</description>
<url>https://github.com/NemakiWare/NemakiWare</url>

<properties>
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
<jersey.version>1.17.1</jersey.version>
<jersey.version>1.19.1</jersey.version>
<org.apache.chemistry.opencmis.version>0.13.0</org.apache.chemistry.opencmis.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
Loading

0 comments on commit 837b697

Please sign in to comment.