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

Merge branch 'release-1.0.7' into develop

parents ca864a31 7c0118fe

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
        "ext-imagick":                   "*",

        "ext-readline":                  "*",

        "unicaen/app":                   "^1.3",

        "unicaen/auth":                  "dev-release-1.3.5 as 1.3.4",

        "unicaen/auth":                  "^1.3",

        "unicaen/faq":                   "^1.0",

        "unicaen/ldap":                  "^2.1",

        "unicaen/import":                "1.0.13",

composer.lock

+5 −13
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": "8afccfba62e406dabd5beca78b7bc0b3",

    "content-hash": "8cf89d8aa3a8b99d31c267555f254266",

    "packages": [

        {

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

        {

            "name": "unicaen/auth",

            "version": "dev-release-1.3.5",

            "version": "1.3.5",

            "source": {

                "type": "git",

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

                "reference": "5e8ee47f61c98249a46a030ee5a6750436c4ba14"

                "reference": "04fb4d44fef8055d97c67b97ae2933bba3fd4c26"

            },

            "require": {

                "bjyoungblood/bjy-authorize": ">=1.4",
@@ -2002,7 +2002,7 @@ 
                ]

            },

            "description": "Module d'authentification pour les applications Unicaen",

            "time": "2019-02-04T14:09:18+00:00"

            "time": "2019-02-04T15:47:07+00:00"

        },

        {

            "name": "unicaen/code",
@@ -3895,17 +3895,9 @@ 
            "time": "2018-02-26T15:47:19+00:00"

        }

    ],

    "aliases": [

        {

            "alias": "1.3.4",

            "alias_normalized": "1.3.4.0",

            "version": "dev-release-1.3.5",

            "package": "unicaen/auth"

        }

    ],

    "aliases": [],

    "minimum-stability": "stable",

    "stability-flags": {

        "unicaen/auth": 20,

        "bjyoungblood/bjy-authorize": 20

    },

    "prefer-stable": false,

config/autoload/version.global.php

+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
return [

    'unicaen-app' => [

        'app_infos' => [

            'version' => '1.0.6',

            'date' => '01/02/2019',

            'version' => '1.0.7',

            'date' => '04/02/2019',

        ],

    ],

    'comment' => 'Fichier généré le 01/02/2019 à 11:02:57 avec /home/gauthierb/workspace/sygal/bump-version',

    'comment' => 'Fichier généré le 04/02/2019 à 16:40:26 avec /home/gauthierb/workspace/sygal/bump-version',

];