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

author	Fabian Eichhorner <fabian.eichhorner@gmail.com>
	Sun, 20 Jan 2019 16:47:23 +0000 (17:47 +0100)
committer	Fabian Eichhorner <fabian.eichhorner@gmail.com>
	Sun, 20 Jan 2019 16:47:23 +0000 (17:47 +0100)
commit	3d2df53b14db85831ff8927e2a5fb0ec542d3c24
tree	50e8e95110ec6f9cf1834219b5127b2b7eb367fd	tree \| snapshot
parent	49618668d8153274ba80cb4f84e53c5231b0c593	commit \| diff
parent	56651b71fc12db0ed75559caba147139b1629967	commit \| diff

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

# Conflicts:
# g6t4.yml