Merge branch 'develop' into feature/WISE-16-remove_user

Browse Source

Conflicts:
	wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
	wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java

...

This commit is contained in:

Paulo Gustavo Veiga

2014-01-25 11:33:31 -03:00

parent 31aab0bd48 5b1fb27ca2

commit a8f7d28c11

41 changed files with 10313 additions and 1920 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

config/database/hsql/atest-data.sql → config/database/hsql/apopulate-schemas.sql