[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.10-7-g4604e34

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 18.11.x has been updated
       via  4604e34a463013169daaa22f716b610880c67b60 (commit)
      from  076e4eff0544844582dfbbd98edd4192995d57f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4604e34a463013169daaa22f716b610880c67b60
Author: Caroline Cyr La Rose <caroline at inlibro.com>
Date:   Fri Aug 16 14:28:59 2019 -0400

    Bug 23353: ACQ framework makes fr-CA web installer explode
    
    This patch removes the standalone ACQ framework SQL file in the fr-CA
    directory and adds the ACQ framework creation SQL in the default
    framework file, as it is in other languages.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 811bee9bce57e67fd22562b3bb62397335b4eeb5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 93b8ea9685ab565018fee3caa021f10a99586830)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 .../obligatoire/marc21_framework_DEFAULT.sql       |   56 ++++++++++++++++++++
 .../obligatoire/marc21_sample_acq_framework.sql    |   56 --------------------
 .../obligatoire/marc21_sample_acq_framework.txt    |    1 -
 3 files changed, 56 insertions(+), 57 deletions(-)
 delete mode 100644 installer/data/mysql/fr-CA/marcflavour/marc21/obligatoire/marc21_sample_acq_framework.sql
 delete mode 100644 installer/data/mysql/fr-CA/marcflavour/marc21/obligatoire/marc21_sample_acq_framework.txt


hooks/post-receive
-- 
main Koha release repository