Chris Cormack b3feb54ee0 Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module ... Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com> Conflicts: installer/data/mysql/en/mandatory/userpermissions.sql installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql installer/data/mysql/updatedatabase30.pl koha-tmpl/intranet-tmpl/prog/en/includes/header.inc koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl serials/member-search.pl serials/serials-edit.pl serials/subscription-add.pl serials/subscription-bib-search.pl serials/subscription-detail.pl Signed-off-by: Galen Charlton <gmcharlt@gmail.com>		2010-06-19 07:23:46 -04:00
..
mandatory	Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module	2010-06-19 07:23:46 -04:00
marcflavour	Fix FSF address in directory installer/	2010-03-16 20:17:50 -04:00
optional	update sample news on new install with koha-community.org urls	2010-05-24 08:56:43 -04:00