Julian Hinxlage 15dddd5d30 Merge remote-tracking branch 'origin/johannes2' into julian2 ...

# Conflicts:
#	src/main/java/de/hsel/itech/db/Database.java

2019-04-23 14:16:05 +02:00

..

css

added booklist and addbook to edit books

2019-04-18 09:07:55 +02:00

preview

added booklist and addbook to edit books

2019-04-18 09:07:55 +02:00

WEB-INF

Merge remote-tracking branch 'origin/johannes2' into julian2

2019-04-23 14:16:05 +02:00