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
This commit is contained in:
@@ -140,6 +140,7 @@
|
||||
<include>Workspace.js</include>
|
||||
<include>ShrinkConnector.js</include>
|
||||
<include>DesignerKeyboard.js</include>
|
||||
<include>TopicStyle.js</include>
|
||||
<include>NodeGraph.js</include>
|
||||
<include>Topic.js</include>
|
||||
<include>CentralTopic.js</include>
|
||||
|
Reference in New Issue
Block a user