Paulo Gustavo Veiga eefad1c7f6 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-21 13:10:07 -03:00

..

doc

Bug WISE-190 fixed.

2014-01-24 09:45:22 -03:00

src

Add undercorejs.js as dependency.

2015-01-31 23:38:17 -03:00

config

Fix open id.

2013-03-10 19:07:52 -03:00

pom.xml

Merge branch 'develop'

2015-02-21 13:10:07 -03:00

webdefault.xml

Revert "fix alias checking for jetty 9.x"

2014-08-18 21:10:25 -03:00