Marc Delisle a83ca5d73b Fix merge conflict ... Signed-off-by: Marc Delisle <marc@infomarc.info>		2014-06-10 12:43:07 -04:00
..
config_functions.lib.php	Various coding style fixes	2013-08-07 10:51:50 +02:00
ConfigFile.class.php	Hard-code mysqli extension in setup DSN	2014-03-29 20:59:06 +01:00
Form.class.php	Don't use function in for loop test.	2013-12-18 22:18:02 +01:00
FormDisplay.class.php	Define type rather than using mixed	2014-06-06 14:59:22 +02:00
FormDisplay.tpl.php	Incorrect attributes for number fields	2014-05-02 08:04:17 -04:00
messages.inc.php	Fix merge conflict	2014-06-10 12:43:07 -04:00
ServerConfigChecks.class.php	[setup] Localize sBlowfishSecretMsg	2014-03-29 20:17:12 +01:00
setup.forms.php	Fix merge conflict	2014-06-10 12:43:07 -04:00
user_preferences.forms.php	Fix merge conflict	2014-06-10 12:43:07 -04:00
Validator.class.php	The ini_set function takes string, not booleans or integers	2014-05-10 11:57:10 +02:00