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
..
en	Merge remote-tracking branch 'kc/master' into merged_5549	2012-03-22 09:36:55 +13:00
img	Bug 6836: Add jQuery dataTables plugin	2012-01-27 11:33:11 +01:00
pdf	bug 4188: move PDF templates for printed purchase orders	2010-07-02 08:49:44 -04:00
sound	Bugzilla 1080 to add enhancement for sound. Only changed circulation.tmpl/pl and returns.tmpl/pl and added a single syspref (set to off) along with very compressed OGG files for sound which are on the open source "artistic" licence.	2010-02-18 08:12:25 -05:00