Commit 4a549e45 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/master'

parents af3faa60 1e8ad018

composer.json

+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
        "unicaen/bjy-authorize"  : "3.0.4",

        "zendframework/zend-file": "2.8.3",

        "unicaen/code"           : "3.0.2",

        "unicaen/import"         : "3.1.2",

        "unicaen/import"         : "3.1.3",

        "unicaen/tbl"            : "4.1",

        "unicaen/open-document"  : "3.0.2",

        "ocramius/proxy-manager" : "2.2.3"

composer.lock

+4 −4
Changes for composer.lock: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",

        "This file is @generated automatically"

    ],

    "content-hash": "f191a20ddf60f8ae6c8fa22905a096f3",

    "content-hash": "ce8809a17b6adc8c21421b95722ba5e4",

    "packages": [

        {

            "name": "beberlei/assert",
@@ -2772,11 +2772,11 @@ 
        },

        {

            "name": "unicaen/import",

            "version": "3.1.2",

            "version": "3.1.3",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/import.git",

                "reference": "a0fac328b3ee946f181d719bcfee1297d7c969f2"

                "reference": "348fb92c5ec224a3c1da425af58859be0a56d8f0"

            },

            "require": {

                "unicaen/auth": "dev-zf-3.x || ^3.0",
@@ -2796,7 +2796,7 @@ 
                ]

            },

            "description": "Module d'import de données vers une base Oracle",

            "time": "2021-02-16T09:00:36+00:00"

            "time": "2021-02-16T09:36:36+00:00"

        },

        {

            "name": "unicaen/open-document",