Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport

Browse Source

Conflicts:
	config/database/hsql/drop-schemas.sql
	config/database/mysql/drop-schemas.sql
	wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
	wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
	wise-webapp/src/main/webapp/js/mindmapList.js

...

This commit is contained in:

Ezequiel Bergamaschi

2014-02-06 02:10:54 -03:00

parent ba90addad2 7525ba4820

commit 1444be36ce

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available