Jared Camins-Esakov e93cc44941 Merge branch 'bug_2832' into 3.12-master ... Conflicts: installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql installer/data/mysql/updatedatabase.pl Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>		2012-11-23 11:41:48 -05:00
..
intranet-tmpl	Merge branch 'bug_2832' into 3.12-master	2012-11-23 11:41:48 -05:00
opac-tmpl	Bug 7932 [Revised] Twitter share doesn't work with socialnetworks	2012-11-20 07:36:00 -05:00
favicon.ico
index.html
intranet.html
opac.html
templates.readme