commit 33955d552396f6b43f53004af77c1ce2e7fcd3f1 parent 11dabcd196ed045fdac91c5916e7b0a25962257e Author: Marcel <MTRNord@users.noreply.github.com> Date: Wed, 6 Dec 2017 17:06:25 +0100 Merge branch 'master' into develop Diffstat:
| M | .circleci/config.yml | | | 3 | +-- |
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -86,4 +86,4 @@ workflows: - prepare - test_win_static: requires: - - prepare -\ No newline at end of file + - prepare