Merge branch 'merge' into 'master'
Merge See merge request !22
.circleci/config.yml
100644 → 100755
File mode changed from 100644 to 100755
.gitignore
100644 → 100755
File mode changed from 100644 to 100755
.gitlab-ci.yml
100644 → 100755
File mode changed from 100644 to 100755
.travis.yml
100644 → 100755
File mode changed from 100644 to 100755