Koha/koha-tmpl/intranet-tmpl/prog
Chris Cormack 4669a10776 Merge remote branch 'kc/new/enh/bug_1962' into kcmaster
Conflicts:
	circ/returns.pl
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/it-IT/necessari/sysprefs.sql
	installer/data/mysql/pl-PL/mandatory/sysprefs.sql
	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
	installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
	installer/data/mysql/updatedatabase.pl
	kohaversion.pl
2011-03-27 21:12:40 +13:00
..
en Merge remote branch 'kc/new/enh/bug_1962' into kcmaster 2011-03-27 21:12:40 +13:00
img Bug 5792 - Add reference icon to Bridge icon set 2011-03-04 12:54:20 +13: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