git.rot13.org Git - koha.git/commit - koha-tmpl/intranet-tmpl/prog/en/columns.def

author	Chris Cormack <chrisc@catalyst.net.nz>
	Mon, 13 Dec 2010 23:24:59 +0000 (12:24 +1300)
committer	Chris Cormack <chrisc@catalyst.net.nz>
	Mon, 13 Dec 2010 23:24:59 +0000 (12:24 +1300)
commit	2b2583546456b2621625380d3f04a4f9a773dd6e
tree	6ca73530ac43387b4f124db7828fa521ca01e644	tree \| snapshot
parent	5278aa0ca4bb5110741b792b527725280a3ee902	commit \| diff
parent	c6a91414135ffd9f16c389ba3d4f96c98878d683	commit \| diff

Merge remote branch 'katrin/3381_intranetusercss' into new/enh/bug_3381

Conflicts:
installer/data/mysql/it-IT/necessari/sysprefs.sql
kohaversion.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git

RSS Atom

installer/data/mysql/de-DE/mandatory/sysprefs.sql	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/en/mandatory/sysprefs.sql	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/it-IT/necessari/sysprefs.sql	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/pl-PL/mandatory/sysprefs.sql	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/updatedatabase.pl	diff1 \|	diff2 \|	blob \| history
kohaversion.pl	diff1 \|	diff2 \|	blob \| history