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

Conflicts:
	src/main/webapp/WEB-INF/spring/mail-services.xml

2014-07-06 22:12:40 +02:00

..

java

Přidaná spouštěcí třída pro unit testy.

2014-07-06 22:11:11 +02:00

resources

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

2014-07-06 22:12:40 +02:00