Commit 98c0fceb authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'b24'

# Conflicts:
#	composer.lock
parents 8f04590a 623a61ad
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@
        "unicaen/siham"                    : "6.2.0",
        "unicaen/mail"                     : "7.1.2",
        "unicaen/vue"                      : "6.3.3",
        "unicaen/bddadmin"                 : "1.4.3",
        "unicaen/bddadmin"                 : "1.5.0",
        "unicaen/signature"                : "1.0.6",
        "connecteur-ose/actul"             : "dev-master",
        "connecteur-ose/pegase"            : "dev-master"
+155 −158

File changed.

Preview size limit exceeded, changes collapsed.