Merge remote-tracking branch 'origin/develop'

Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
This commit is contained in:
Ezequiel Bergamaschi
2015-10-29 23:06:57 -03:00
18 changed files with 219 additions and 52 deletions

View File

@@ -9,7 +9,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>4.0.2</version>
<version>4.0.3</version>
</parent>
<scm>
<developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>