zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 88fed0af0a cf0b3cf80d
commit 9a1c0fe46d
41 changed files with 10313 additions and 1920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/webapp/jsp/footer.jsp
View File

@@ -55,7 +55,7 @@
</div>
<div class="span1">
<a href="https://www.w3.org/html/logo/">
<img src="/images/badge/html5-badge-h-graphics.png" width="66" height="32"
<img src="images/html5-badge-h-graphics.png" width="66" height="32"
alt="HTML5 Powered with Graphics, 3D &amp; Effects"
title="HTML5 Powered with Graphics, 3D &amp; Effects">
</a>