Koha/installer/data/mysql
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
..
atomicupdate Merge remote-tracking branch 'kc/master' into merged_5549 2012-03-22 09:36:55 +13:00
de-DE bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
en bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
es-ES bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
fr-FR bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
it-IT bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
nb-NO bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
pl-PL bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
ru-RU bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
uk-UA bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
backfill_statistics.pl Bug 5370: Fix all the references to koha.org 2010-11-08 09:41:49 +13:00
kohastructure.sql Merge remote-tracking branch 'kc/master' into merged_5549 2012-03-22 09:36:55 +13:00
labels_upgrade.pl
patroncards_upgrade.pl
sample_only_param_tables.sql
sysprefs.sql Bug 7310 Followup for sysprefs.sql 2012-03-21 16:47:11 +01:00
update22to30.pl Bug 5385: POD Cleanups (part 1) 2010-11-12 10:06:55 +13:00
updatedatabase.pl Merge remote-tracking branch 'kc/master' into merged_5549 2012-03-22 09:36:55 +13:00