Merge remote-tracking branch 'origin/develop' into feature/WISE-214-JasmineTests

This commit is contained in:
Ezequiel Bergamaschi
2014-09-25 03:10:05 -03:00
180 changed files with 10933 additions and 11486 deletions

View File

@@ -4,7 +4,7 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<properties>
<com.wisemapping.version>3.1-SNAPSHOT</com.wisemapping.version>
<com.wisemapping.version>3.0.5-SNAPSHOT</com.wisemapping.version>
<superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
</properties>
@@ -12,7 +12,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<name>WiseMapping Project</name>
<version>3.1-SNAPSHOT</version>
<version>3.0.5-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>