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

Conflicts:
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp
This commit is contained in:
Ezequiel Bergamaschi
2014-02-10 22:16:48 -03:00
12 changed files with 568 additions and 656 deletions

View File

@@ -338,7 +338,7 @@ abbr[title] {
}
#foldersContainer {
padding-top: 60px;
padding-top: 86px;
}
#footerContainer > ul {