František Přibyl 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		11 years ago
src	Merge branch 'master' of	11 years ago
pom.xml	Agenda Dodavatelé - adresář	11 years ago