[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.07-28-g98143ea

[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, 3.10.x has been updated
       via  98143eabc7cf4a8ff67c67d4026688bef7f41c65 (commit)
      from  4e2f26b151d9fe1072e7ceffaabc9a31b6d4dfdb (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 98143eabc7cf4a8ff67c67d4026688bef7f41c65
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Feb 19 08:42:11 2013 -0500

    Bug 9458 - Add sorting to lists - QA Followup
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit bc9f606ca7025417f3f2fddd393983cc0beec0ba)
    
    Solved Conflicts:
    	C4/VirtualShelves/Page.pm
    	koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit bc9f606ca7025417f3f2fddd393983cc0beec0ba)

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

Summary of changes:
 C4/VirtualShelves.pm                               |    2 +-
 C4/VirtualShelves/Page.pm                          |   10 +++++---
 .../prog/en/modules/virtualshelves/shelves.tt      |   10 ++++++--
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |   22 +++++++++++++++++++-
 4 files changed, 35 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository