wisemapping-open-source/wise-webapp
Ezequiel Bergamaschi 572eb44e7a Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport
Conflicts:
	wise-webapp/src/main/webapp/bootstrap/css/bootstrap.css
	wise-webapp/src/main/webapp/bootstrap/css/bootstrap.min.css
	wise-webapp/src/main/webapp/css/mindmapList.less
	wise-webapp/src/main/webapp/js/mindmapList.js
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp
2014-02-10 01:07:50 -03:00
..
doc Bug WISE-190 fixed. 2014-01-24 09:45:22 -03:00
src Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport 2014-02-10 01:07:50 -03:00
config Fix open id. 2013-03-10 19:07:52 -03:00
pom.xml Revert "changing jetty version" 2014-01-30 00:03:06 -03:00
webdefault.xml Improve and fix print. 2012-04-05 14:18:13 -03:00