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

Conflicts:
	src/main/java/info/bukova/isspst/Constants.java
	src/main/resources/ValidationMessages.properties
	src/main/resources/hibernate.cfg.xml

2014-06-07 22:02:25 +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-07 22:02:25 +02:00