Compare commits

...

18 Commits

Author SHA1 Message Date
interfisch 83ca29d94e Merge branch 'master' into deploy 2017-10-26 23:51:28 +02:00
interfisch 606207d27c Merge branch 'master' into deploy 2017-05-20 20:53:16 +02:00
interfisch 9c607bf901 deleted .gitlab-ci.yml 2017-03-02 20:15:05 +01:00
interfisch b85e9eeb88 conflict solved, maybe 2017-02-23 22:14:44 +01:00
interfisch ceb0f3dc46 Merge branch 'master' into deploy 2017-02-18 20:35:17 +01:00
interfisch 9dcedb1c45 conflict! .gitlab-ci.yml deletion added. hopefully this commit doesnt explode and kill my whole family o.0 2017-02-18 20:09:36 +01:00
interfisch f9e69a8bb6 Merge branch 'master' into deploy 2017-02-17 01:36:02 +01:00
interfisch e0fc46af48 Merge branch 'master' into deploy 2017-02-17 01:29:52 +01:00
interfisch ee3915b62e Merge branch 'master' into deploy 2017-02-17 01:16:00 +01:00
Stefan Kinzel e2ccafac89 resolved conflict 2017-02-17 01:02:01 +01:00
Stefan Kinzel 0686597fb2 yadt 2017-02-17 00:56:37 +01:00
Stefan Kinzel c9d48ca25a yadt 2017-02-17 00:55:11 +01:00
Stefan Kinzel 961538b940 yadt 2017-02-17 00:36:41 +01:00
Stefan Kinzel 3e1405856d yadt 2017-02-17 00:28:21 +01:00
Stefan Kinzel 419aa5e3f5 yet another deploy test 2017-02-17 00:24:25 +01:00
Stefan Kinzel 21ab8e990b Merge branch 'master' into deploy 2017-02-17 00:22:35 +01:00
Stefan Kinzel 2794b5c762 next deploy-test 2017-02-17 00:01:21 +01:00
Stefan Kinzel b32c78d4dc changed ip to ::1 (and first deploy-test) 2017-02-16 23:16:08 +01:00

Diff Content Not Available