You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
isspst/src/main
František Přibyl a074dd376d Merge branch 'master' of https://git.bukova.info/repos/git/isspst
Conflicts:
	src/main/java/info/bukova/isspst/AppInitListener.java
	src/main/resources/hibernate.cfg.xml
11 years ago
..
java Merge branch 'master' of https://git.bukova.info/repos/git/isspst 11 years ago
resources Merge branch 'master' of https://git.bukova.info/repos/git/isspst 11 years ago
webapp Merge branch 'master' of https://git.bukova.info/repos/git/isspst 11 years ago