wisemapping-open-source/wise-webapp
Ezequiel Bergamaschi 5a863734a0 Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
Conflicts:
	mindplot/src/main/javascript/widget/LinkIconTooltip.js
	wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
2014-09-26 23:24:41 -03:00
..
doc Bug WISE-190 fixed. 2014-01-24 09:45:22 -03:00
src Merge remote-tracking branch 'origin/develop' into feature/remove_mootols 2014-09-26 23:24:41 -03:00
config Fix open id. 2013-03-10 19:07:52 -03:00
pom.xml Merge remote-tracking branch 'origin/develop' into feature/remove_mootols 2014-09-26 23:24:41 -03:00
webdefault.xml Revert "fix alias checking for jetty 9.x" 2014-08-18 21:10:25 -03:00