Chris Cormack 0c40ff9f98 Merge remote-tracking branch 'kc/master' into merged_5549 ... Fixed conflicts Conflicts: catalogue/moredetail.pl installer/data/mysql/updatedatabase.pl koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt		2012-03-22 09:36:55 +13:00
..
acquisitions.pref	Bug 7731 - Library should be used instead of branch and site	2012-03-20 15:17:08 +01:00
admin.pref	Bug 7731 - Library should be used instead of branch and site	2012-03-20 15:17:08 +01:00
authorities.pref	signed off Bug 7284: Authority matching improvements	2012-03-07 17:34:11 +01:00
cataloguing.pref	Bug 5528: Analytic records support	2011-10-13 10:03:39 +13:00
circulation.pref	Bug 7731 - Library should be used instead of branch and site	2012-03-20 15:17:08 +01:00
creators.pref	Bugfix: Adding Creators system preferences to new system preferences editor	2010-02-02 18:42:55 -05:00
enhanced_content.pref	Bug 1633: [SIGNED-OFF] Add support for uploading images to Koha	2012-01-24 11:16:02 +01:00
i18n_l10n.pref	Bug 7261 System Preference to select the first day of week	2012-03-14 14:14:12 +01:00
local_use.pref	Bug 5462: fixed current preferences tab highlighting bug created by dashfix	2011-02-03 09:58:52 +00:00
logs.pref	bug 5783: follow-up system preferences tweaks	2011-03-07 15:09:23 +13:00
opac.pref	Merge remote-tracking branch 'kc/master' into merged_5549	2012-03-22 09:36:55 +13:00
patrons.pref	Bug 6964 - 'Add child' function should be dependant on system preference 'borrowerRelationship'	2012-02-02 11:36:05 +01:00
searching.pref	Bug 7092 - Complete-subfield searches TraceCompleteSubfields syspref not working correctly	2012-03-21 14:53:14 +01:00
serials.pref	Bug 7557: Change hardcoded routing list note into a system preference	2012-03-14 16:27:07 +01:00
staff_client.pref	bug_7001: Issue and Reserve slips are notices.	2012-03-09 10:11:20 +01:00
web_services.pref	Bug 6440: Implement OAI-PMH Sets	2012-03-20 11:38:26 +01:00