Mariela Michalek 094d08df4d Merge branch 'feature/remove_mootols' of bitbucket.org:wisemapping/wisemapping-open-source into feature/remove_mootols ...

Conflicts:
	mindplot/src/main/javascript/LinkIcon.js

2014-08-24 16:46:43 -03:00

..

src

Merge branch 'feature/remove_mootols' of bitbucket.org:wisemapping/wisemapping-open-source into feature/remove_mootols

2014-08-24 16:46:43 -03:00

pom.xml

fixing Options problem

2014-05-16 00:27:57 -03:00