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

Conflicts: src/main/resources/hibernate.cfg.xml src/main/webapp/WEB-INF/spring/root-context.xml
2014-05-12 08:44:06 +02:00
parent 1f1f053675 3f411eadd2
commit 4e2faa7c2c
63 changed files with 2154 additions and 124 deletions
@@ -31,6 +31,7 @@
 				<menuitem label="Střediska" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
 				<menuitem label="${labels.AgendaBuildings}" href="/buildings"/>
 				<menuitem label="Místnosti" href="/admin/users"/>
+				<menuitem label="Dodavatelé" href="/admin/addressbook"/>
 			</menubar>
 		</tabpanel>
 		<tabpanel>