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

Conflicts:
	src/main/webapp/app/navigation.zul

2014-06-13 12:20:57 +02:00

..

columns.properties

Načítání názvů pro sestavy z properties souboru.

2014-05-30 12:23:20 +02:00

zk-label.properties

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

2014-06-13 12:20:57 +02:00