Commit 62115364 authored by David Surville's avatar David Surville
Browse files

Merge branch 'master' into zf-3.0

parents 41fb1f8b 617a8566
Loading
Loading
Loading
Loading
+2 −2
Changes for composer.json: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
  "name": "unicaen/ldap",
  "description": "Module Ldap des applications Unicaen",
  "require": {
    "php":                                  "^5.6 || ^7.0",
    "php":                                  "7.3.*",
    "zendframework/zend-config":            "^3.2",
    "zendframework/zend-i18n":              "^2.9",
    "zendframework/zend-ldap":              "^2.10",
@@ -14,7 +14,7 @@
  },
  "require-dev": {
    "phpunit/phpunit":         ">=3.7",
    "zendframework/zend-test": ">=2.2"
    "zendframework/zend-test": "^3.2"
  },
  "autoload": {
    "psr-0": {
+1383 −940

File changed.

Preview size limit exceeded, changes collapsed.