4 commits

Author	SHA1	Message	Date
Stefan Kinzel	e2ccafac89	resolved conflict	2017-02-17 01:02:01 +01:00
stefan	0007e64985	Update .gitlab-ci.yml	2017-02-17 00:35:55 +01:00
Stefan Kinzel	3e1405856d	yadt	2017-02-17 00:28:21 +01:00
stefan	1484d3b16b	Add .gitlab-ci.yml	2017-02-16 23:14:07 +01:00