Commit e9f039c8 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge avec le master.

parents 1472e0d4 d055828c
Loading
Loading
Loading
Loading
−65

File deleted.

−73

File deleted.

−68

File deleted.

+3 −1
Changes for composer.json: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -12,12 +12,14 @@
        "zendframework/zend-developer-tools":   "^1.0"
    },
    "require": {
        "ext-fileinfo":                         "*",
        "ext-json":                             "*",
        "ext-imagick":                          "*",
        "unicaen/app":                          "^1.3",
        "unicaen/auth":                         "^1.2",
        "unicaen/faq":                          "^1.0",
        "unicaen/ldap":                         "^2.1",
        "unicaen/import":                       "1.0.11",
        "unicaen/import":                       "1.0.13",
        "unicaen/leocarte":                     "^1.0",
        "unicaen/code":                         "^1.0",
        "ramsey/uuid":                          "^3.3",
+10 −6
Changes for composer.lock: 10 added lines, 6 removed lines.
Original line number Diff line number Diff line
{
    "_readme": [
        "This file locks the dependencies of your project to a known state",
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
    "content-hash": "bd8c3d3e91508f7df99c5680292ae9d2",
    "content-hash": "946a5ea1f43e05305f62da7f28d3b592",
    "packages": [
        {
            "name": "beberlei/assert",
@@ -2000,11 +2000,11 @@
        },
        {
            "name": "unicaen/import",
            "version": "1.0.11",
            "version": "1.0.13",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/import.git",
                "reference": "c02bc2f48ac080137b9e21b0f3f1256014caf84b"
                "reference": "124e7b9a80fedac3f953044ec09a93bd271d6568"
            },
            "require": {
                "unicaen/auth": "1.*",
@@ -2024,7 +2024,7 @@
                ]
            },
            "description": "Boite à outils pour la programmation avec la bibliothèque Unicaen",
            "time": "2018-02-27T09:02:30+00:00"
            "time": "2018-12-04T16:09:21+00:00"
        },
        {
            "name": "unicaen/ldap",
@@ -3841,6 +3841,10 @@
    },
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": [],
    "platform": {
        "ext-fileinfo": "*",
        "ext-json": "*",
        "ext-imagick": "*"
    },
    "platform-dev": []
}
Loading