Commit 7529b9c4 authored by nanahira's avatar nanahira

Merge branch 'master' into newcards

parents c4f658b7 c33a8abb
...@@ -27,3 +27,7 @@ build_script: ...@@ -27,3 +27,7 @@ build_script:
- cd .. - cd ..
test: off test: off
branches:
only:
- master
Markdown is supported
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