wisemapping-open-source/wise-webapp
Paulo Gustavo Veiga a8f7d28c11 Merge branch 'develop' into feature/WISE-16-remove_user
Conflicts:
	wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
	wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
2014-01-25 11:33:31 -03:00
..
doc Bug WISE-190 fixed. 2014-01-24 09:45:22 -03:00
src Merge branch 'develop' into feature/WISE-16-remove_user 2014-01-25 11:33:31 -03:00
config Fix open id. 2013-03-10 19:07:52 -03:00
pom.xml Add Maven Tomcat Plugin. 2014-01-25 04:53:51 -03:00
webdefault.xml Improve and fix print. 2012-04-05 14:18:13 -03:00