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

..

java

Merge branch 'master' of

2014-05-19 09:30:17 +02:00

resources

Systém přístupových práv

2014-05-18 20:19:39 +02:00

webapp

Merge branch 'master' of

2014-05-19 09:30:17 +02:00