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
..
data	Merge branch 'bug_2832' into 3.12-master	2012-11-23 11:41:48 -05:00
InstallAuth.pm	Bug 6627 follow-up	2012-01-06 14:22:59 +01:00
externalmodules.pl	Bug 2505 - remove unnecessary -w and replace with use warnings;	2010-04-07 13:27:07 -04:00
html-template-to-template-toolkit.pl	Bug 5917 using_https should be a global	2011-04-05 16:51:56 +12:00
install.pl	Bug 7857 - [SIGNED-OFF] database upgrade fails with plack	2012-06-20 21:33:34 +02:00