Commit Graph
6 Commits
Author SHA1 Message Date
franta 7d4537f332 Oprava 2014-05-19 09:32:17 +02:00
franta 47ff0cb026 Merge branch 'master' of
https://franta@git.bukova.info/repos/git/isspst.git

Conflicts:
	src/main/java/info/bukova/isspst/ui/ListViewModel.java
	src/main/webapp/WEB-INF/jdbc.properties
	src/main/webapp/WEB-INF/spring/root-context.xml
2014-05-19 09:30:17 +02:00
franta f93021485e Validace Budov. 2014-05-19 09:20:49 +02:00
franta 3718e4c088 Zprovozněny Budovy 2014-05-12 09:20:31 +02:00
franta 4e2faa7c2c 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
franta 1f1f053675 Přidána agenda Budovy. 2014-05-12 08:36:00 +02:00