Ezequiel Bergamaschi 572eb44e7a Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport ... Conflicts: wise-webapp/src/main/webapp/bootstrap/css/bootstrap.css wise-webapp/src/main/webapp/bootstrap/css/bootstrap.min.css wise-webapp/src/main/webapp/css/mindmapList.less wise-webapp/src/main/webapp/js/mindmapList.js wise-webapp/src/main/webapp/jsp/mindmapList.jsp		2014-02-10 01:07:50 -03:00
..
bootstrap	Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport	2014-02-10 01:07:50 -03:00
css	Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport	2014-02-10 01:07:50 -03:00
doc/rest	Bug WISE-190 fixed.	2014-01-24 09:45:22 -03:00
images	Resources moved to https.	2014-01-02 18:34:14 -03:00
js	Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport	2014-02-10 01:07:50 -03:00
jsp	Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport	2014-02-10 01:07:50 -03:00
META-INF	Remove trunk directory	2009-11-06 23:30:29 -02:00
WEB-INF	adding new suite test	2014-02-09 13:57:00 -03:00
favicon.ico	Add Google Analitycs to the footer.	2012-07-03 00:04:44 -03:00
index.html	Add support for homepage configuration.	2012-09-01 14:38:19 -03:00
index.jsp	Add support for homepage configuration.	2012-09-01 14:38:19 -03:00