[koha-commits] main Koha release repository branch master updated. v19.11.00-2055-ga6985d167e

[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  a6985d167e11eaafee985b51cb0188a693405af5 (commit)
      from  164b8127e719628aa9013dd2b30fb6511fbc4bf9 (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 a6985d167e11eaafee985b51cb0188a693405af5
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon May 4 11:33:11 2020 +0000

    Bug 25133: (follow-up) Move changes to timepicker.inc
    
    Witht the changes in calendar.inc there can be a js error where the timepicker is not
    included. Moving the changes to timepicker.inc should resolve this
    
    Note: in previous patches the amnames/pmnames were removed. It is possible they had
    no effect because they were declared in two files, so I have left them in timepicker.inc
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc   | 4 ----
 koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository