Commit d0c9bbc0 authored by CI Runner's avatar CI Runner
Browse files

Merge branch '7.x' into 7.x-36

parents 7bfca4a4 a363ceea
......@@ -8,4 +8,7 @@ docs:
- apt-get update -yqq && apt-get install -yqq ncftp wget
- echo "Merge marker sanity check"
- (grep -ri "<<<<<<" * || grep -ri ">>>>>>" *) && (echo "found some merge conflicts, will abort"; exit -1)
- ./deploy.sh
\ No newline at end of file
- ./deploy.sh
only:
refs:
- /^.\.x-..*$/
\ No newline at end of file
Supports Markdown
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