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

Browse Source

Conflicts:
	src/main/resources/hibernate.cfg.xml
	src/main/webapp/WEB-INF/spring/root-context.xml

...

This commit is contained in:

František Přibyl

2014-05-12 08:44:06 +02:00

parent 1f1f053675 3f411eadd2

commit 4e2faa7c2c

63 changed files with 2154 additions and 124 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/save.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 719 B

src/main/webapp/img/search.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 778 B