wisemapping-open-source/wise-webapp
Ezequiel Bergamaschi 2ee977c501 Merge remote-tracking branch 'origin/develop'
Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
2015-10-29 23:06:57 -03:00
..
doc Bug WISE-190 fixed. 2014-01-24 09:45:22 -03:00
src zoom factor decreased, fixing some js errors due to legacy code 2015-10-29 22:31:40 -03:00
config Fix open id. 2013-03-10 19:07:52 -03:00
pom.xml Merge remote-tracking branch 'origin/develop' 2015-10-29 23:06:57 -03:00
webdefault.xml Revert "fix alias checking for jetty 9.x" 2014-08-18 21:10:25 -03:00