wisemapping-open-source/wise-webapp
Paulo Gustavo Veiga a74efa4647 Merge branch 'master' into db-purge
Conflicts:
	mindplot/src/main/javascript/MainTopic.js
	wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
	wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
2012-11-04 01:38:52 -03:00
..
doc Add new doc. 2012-11-01 21:36:41 -03:00
src Merge branch 'master' into db-purge 2012-11-04 01:38:52 -03:00
pom.xml Fix integration tests execution. 2012-11-04 01:06:02 -03:00
webdefault.xml Improve and fix print. 2012-04-05 14:18:13 -03:00