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

author	Sebastian Steiner <e1029038@student.tuwien.ac.at>
	Sun, 20 Jan 2019 21:11:08 +0000 (22:11 +0100)
committer	Sebastian Steiner <e1029038@student.tuwien.ac.at>
	Sun, 20 Jan 2019 21:11:08 +0000 (22:11 +0100)
commit	17269531d4914d47d68e41975f4fa59aed6cbde9
tree	1474a5118760e0cb71ed4e9d4e7620f76e40a8b1	tree \| snapshot
parent	3d2df53b14db85831ff8927e2a5fb0ec542d3c24	commit \| diff
parent	5e4422c1fe021b21d991f62e43cabbb7ce50c1b5	commit \| diff

Merge branch 'master' into '49-upload-all-containers-to-public-repo-in-docker-hub'

# Conflicts:
# g6t4.yml