Marcel b65df5f7be Merge branch 'auctionhouse-websub' of https://github.com/SCS-ASSE-FS21-Group1/tapas into auctionhouse-websub		2021-11-14 22:09:33 +01:00
..
main	Merge branch 'auctionhouse-websub' of https://github.com/SCS-ASSE-FS21-Group1/tapas into auctionhouse-websub	2021-11-14 22:09:33 +01:00
test/java/ch/unisg/tapas	merge everything from main project	2021-10-18 11:45:52 +02:00