zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/remove_mootols

Browse Source 
Conflicts:
	mindplot/src/main/javascript/widget/LinkIconTooltip.js
	wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
This commit is contained in:
Ezequiel Bergamaschi
2014-09-26 23:24:41 -03:00
parent c3ebde34d7 09606bf820
commit 2f3cc5fd32
151 changed files with 10302 additions and 10359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/pom.xml
View File

@@ -9,7 +9,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>3.1-SNAPSHOT</version>
<version>3.0.5-SNAPSHOT</version>
</parent>
<repositories>