[koha-commits] main Koha release repository branch, new/enh/bug_3381, created. v3.02.00-314-g2b25835

[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, new/enh/bug_3381 has been created
        at  2b2583546456b2621625380d3f04a4f9a773dd6e (commit)

- Log -----------------------------------------------------------------
commit 2b2583546456b2621625380d3f04a4f9a773dd6e
Merge: 5278aa0ca4bb5110741b792b527725280a3ee902 c6a91414135ffd9f16c389ba3d4f96c98878d683
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Dec 14 12:24:59 2010 +1300

    Merge remote branch 'katrin/3381_intranetusercss' into new/enh/bug_3381
    
    Conflicts:
    	installer/data/mysql/it-IT/necessari/sysprefs.sql
    	kohaversion.pl
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit c6a91414135ffd9f16c389ba3d4f96c98878d683
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sat Dec 11 23:47:47 2010 +0100

    Bug 3381 - Add an IntranetUserCSS system preference
    
    Add an IntranetUserCSS sys pref that works like OPACUserCSS in OPAC only for intranet.

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


hooks/post-receive
-- 
main Koha release repository