[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-16-gea6239a

[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.05.x has been updated
       via  ea6239a434ccbd4f9573df4c71c03ce323aa4a8e (commit)
      from  3bc2c31c8e530ff7e611a93f7f5ffeaad66ea9f0 (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 ea6239a434ccbd4f9573df4c71c03ce323aa4a8e
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Thu Dec 6 15:17:37 2018 +0100

    Bug 21966: Fix descriptions of acquisition permissions to be more clear (again)
    
    This was already done and pushed on bug 3849, but some of it got
    undone accidentally by a later patch.
    
    To test:
    - Check the acquisition permissions
    - The *budget* permissions should clearly describe their
      use for 'funds'.
    
    Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 940c5c0add3065d35f776a3a19ba87d936e84a0f)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit bda0f717cda8d57373b1619c17234ea9230dd416)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository