Skip to content

Commit

Permalink
Merge pull request #6 from gabel/upstream-master
Browse files Browse the repository at this point in the history
Fix zephir compilation error on Imagick
  • Loading branch information
virgofx authored Jan 3, 2017
2 parents 53e0560 + 677d1c8 commit 6180c1d
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 29 deletions.
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "techpivot/phalcon-ci-installer",
"description": "Composer integration for PHP applications to install the Phalcon framework as an extension in the PHP runtime for various hosted CI services including TravisCI, CircleCI, Scrutinizer, Shippable and Codeship.",
"license": "MIT",
"keywords": [
"TechPivot",
"keywords": [
"TechPivot",
"Phalcon",
"PHP",
"Continuous Integration",
Expand All @@ -15,12 +15,12 @@
],
"require": {
"php": "^5.4|^5.5|^5.6|^7.0",
"phalcon/zephir": "~0.9"
"phalcon/zephir": "dev-master"
},
"require-dev": {
"phpunit/phpunit": "~3.7"
},
"bin": [
"bin/install-phalcon.sh"
]
}
}
56 changes: 31 additions & 25 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6180c1d

Please sign in to comment.