Commit Graph

2 Commits

Author SHA1 Message Date
Martin/Geno ab1ef026aa Merge branch 'master' into 'genofire-master-patch-74380'
# Conflicts:
#   .gitlab-ci.yml
2019-02-26 15:48:46 +01:00
Martin/Geno 3bb042713d Update ci 2019-02-26 13:07:58 +01:00