Commit Graph

2 Commits

Author SHA1 Message Date
Pablol
18dfd82c1d Merge branch 'wise-doc' into collaboration
Conflicts:
	mindplot/pom.xml
	mindplot/src/main/javascript/DesignerActionRunner.js
	mindplot/src/main/javascript/DragTopic.js
	mindplot/src/main/javascript/MindmapDesigner.js
	wise-doc/src/main/webapp/html/editor.html
	wise-doc/src/main/webapp/js/editor.js
2011-08-07 19:51:55 -03:00
Pablol
bd888412f7 adding general collaboration framework and Brix 2011-08-07 19:27:23 -03:00