Ezequiel Bergamaschi 02cb53d082 fixing merge conflicts

2014-01-25 19:54:28 -03:00

..

doc

Bug WISE-190 fixed.

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

src

fixing merge conflicts

2014-01-25 19:54:28 -03:00

config

Fix open id.

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

pom.xml

fixing merge conflicts

2014-01-25 19:54:28 -03:00

webdefault.xml

Improve and fix print.

2012-04-05 14:18:13 -03:00