IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Browse Source 
Conflicts:
	src/main/webapp/app/mainMenu.zul
This commit is contained in:
František Přibyl
2015-02-09 13:35:35 +01:00
parent 277ea0f993 678c140a94
commit 93e1ef1fd3
19 changed files with 1152 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/app/mainMenu.zul
-1
View File
@@ -135,7 +135,6 @@
href="/j_spring_security_logout" />
</menupopup>
</menu>
<menuitem label="${labels.Help}" target="blank"
href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&amp;usp=sharing_eid"
tooltiptext="${labels.GoogleDriveUrl}" />
<menuseparator />