wisemapping-open-source/config/database
Paulo Gustavo Veiga 9a1c0fe46d 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
..
hsql Merge branch 'develop' into feature/WISE-16-remove_user 2014-01-25 11:33:31 -03:00
mysql Merge branch 'develop' into feature/WISE-16-remove_user 2014-01-25 11:33:31 -03:00
postgres Fix postgress schema. 2013-05-19 11:42:06 -03:00