git.somenet.org - pub/jan/aic18.git/commit

author	Michael Winsauer <e1429715@student.tuwien.ac.at>
	Sun, 20 Jan 2019 01:24:21 +0000 (02:24 +0100)
committer	Michael Winsauer <e1429715@student.tuwien.ac.at>
	Sun, 20 Jan 2019 01:24:21 +0000 (02:24 +0100)
commit	60a12dcc462e2b2736889f0991b304f407a4f72e
tree	40f432a1e5b722c3c372941a9e634c7480fc72b4	tree \| snapshot
parent	b09d44540dd80d57a20442141b00753da053158f	commit \| diff
parent	5cc15de54681421e3472be79aa8321390b35fb83	commit \| diff

Merge remote-tracking branch 'origin/master' into 46-create-basic-website