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

Browse Source

Conflicts:
	src/main/java/info/bukova/isspst/Constants.java
	src/main/resources/ValidationMessages.properties
	src/main/resources/hibernate.cfg.xml

...

This commit is contained in:

Josef Rokos

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

parent 8db25ecdda 4451850603

commit 607139d790

22 changed files with 337 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/main/webapp/img/munits.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB