Skip to content
Snippets Groups Projects
Commit f0f3fe5d authored by Giovannoni Laurent's avatar Giovannoni Laurent
Browse files

Merge branch 'master' into 'develop' 

# Conflicts:
#   .gitlab-ci.yml
parents 8fd0d110 d144a4e6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.gitlab-ci.yml
+ 1
− 1
View file @ f0f3fe5d
......@@ -45,4 +45,4 @@ job_php-7.0:
#- cd App/MaarchRM
- phpunit --coverage-text --colors=never -c phpunit.xml
only:
- develop
- develop
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment