Paulo Gustavo Veiga 6ce24d39df Merge branch 'develop' ... Conflicts: core-js/pom.xml mindplot/pom.xml pom.xml web2d/pom.xml wise-editor/pom.xml wise-webapp/pom.xml		2015-02-06 22:48:58 -03:00
..
src	adding jasmine configuration and suite to core-js module	2014-09-26 23:22:37 -03:00
pom.xml	Merge branch 'develop'	2015-02-06 22:48:58 -03:00