[koha-commits] main Koha release repository branch master updated. v18.05.00-989-gf11cb49

[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, master has been updated
       via  f11cb49a3682221b5e72de03a8627e14d879d1c0 (commit)
       via  216a8f1d0301093d7bd90c1a13d10ebd03d23d6b (commit)
      from  01646f974355f48a97ca61936cf3a787f6077af2 (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 f11cb49a3682221b5e72de03a8627e14d879d1c0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Oct 9 14:11:28 2018 -0300

    Bug 11897: Add mising semi-colon to user*.sql
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 216a8f1d0301093d7bd90c1a13d10ebd03d23d6b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Oct 9 14:08:33 2018 -0300

    Bug 11897: (follow-up) Add Stock Rotation atomic update schema
    
    Remove the duplicate entry for RoutingListAddReserves
    I guess it has been caused by a bad merge resolution conflict
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

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

Summary of changes:
 installer/data/mysql/sysprefs.sql        |    1 -
 installer/data/mysql/userflags.sql       |    2 +-
 installer/data/mysql/userpermissions.sql |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository