mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-05 07:03:24 +01:00
Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport
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:
commit
1444be36ce