Skip to content

Commit

Permalink
Merge branch 'hotfix/ldap-soft-requirement'
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Jun 4, 2015
2 parents 9a47128 + 5f7c029 commit 589ba5d
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"zendframework/zend-i18n-resources": "~2.5.0",
"zendframework/zend-inputfilter": "~2.5.0",
"zendframework/zend-json": "~2.5.0",
"zendframework/zend-ldap": "~2.5.0",
"zendframework/zend-loader": "~2.5.0",
"zendframework/zend-log": "~2.5.0",
"zendframework/zend-mail": "~2.5.0",
Expand Down Expand Up @@ -63,6 +62,9 @@
"zendframework/zend-xmlrpc": "~2.5.0",
"zendframework/zendxml": "~1.0"
},
"suggest": {
"zendframework/zend-ldap": "zend-ldap component ~2.5.0, if you need LDAP features"
},
"bin": [
"bin/classmap_generator.php",
"bin/pluginmap_generator.php",
Expand Down

0 comments on commit 589ba5d

Please sign in to comment.