vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-12-26 21:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
266 Commits 10 Branches 29 Tags 26 MiB
18dfd82c1d
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