Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport

Browse Source

Conflicts:
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp

...

This commit is contained in:

Ezequiel Bergamaschi

2014-02-14 03:54:36 -03:00

parent e9ca68732e 1c530a0460

commit fbea000aad

10 changed files with 126 additions and 96 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/mysql/v3.0-to-v3.2.sql → config/database/mysql/v3.1-to-v3.3.sql