Julian Hinxlage
15dddd5d30
Merge remote-tracking branch 'origin/johannes2' into julian2
# Conflicts: # src/main/java/de/hsel/itech/db/Database.java
Description
Languages
CSS
55.7%
HTML
26.6%
Java
17.7%