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
..
src	zoom factor decreased, fixing some js errors due to legacy code	2015-10-29 22:31:40 -03:00
pom.xml	Merge remote-tracking branch 'origin/develop'	2015-10-29 23:06:57 -03:00