Merge branch 'DEVELOPMENT' of ssh://nwrk.biz:2294/~/server into DEVELOPMENT
authorRiMa <s1810567015@students.fh-hagenberg.at>
Tue, 18 Dec 2018 16:07:20 +0000 (17:07 +0100)
committerRiMa <s1810567015@students.fh-hagenberg.at>
Tue, 18 Dec 2018 16:07:20 +0000 (17:07 +0100)
commit569dcbc97fac1acc22786903ce5c5e740452db4e
tree619ab89c2c56ceb3ffde428356aee400cf7094c7
parentfd3f2ce2c15a6eebd38491cf168e1380f9ac62a3
parent0ed8c3915dddc8fc012c7a109cb8b121643d12c2
Merge branch 'DEVELOPMENT' of ssh://nwrk.biz:2294/~/server into DEVELOPMENT