Merge branch 'Verze_1.0'

Conflicts: src/main/webapp/WEB-INF/locales/zk-label.properties src/main/webapp/app/mainMenu.zul
2015-01-20 10:35:38 +01:00
parent eed31fe6da ba99079a85
commit 08532dcd02
8 changed files with 42 additions and 4 deletions
@@ -192,6 +192,10 @@
    <location>/error.zul</location>   
  </error-page>

+	<session-config>
+      <session-timeout>480</session-timeout>
+  </session-config>
+	
 	<welcome-file-list>
 		<welcome-file>index.zul</welcome-file>
 		<welcome-file>index.zhtml</welcome-file>