Merge https://github.com/friendica/friendica into pull

3 files changed, 2 insertions, 2 deletions

diff --git a/include/config.php b/include/config.php
index 4cff38090..4cff38090 100755..100644
--- a/include/config.php
+++ b/include/config.php
diff --git a/include/dba.php b/include/dba.php
index 76cc0bc7b..76cc0bc7b 100755..100644
--- a/include/dba.php
+++ b/include/dba.php
diff --git a/include/security.php b/include/security.php
index 66622fd33..fc816e5d7 100644..100755
--- a/include/security.php
+++ b/include/security.php
@@ -326,7 +326,7 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
 }
 
 function check_form_security_std_err_msg() {
-	return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it.') . EOL;
+	return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL;
 }
 function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') {
 	if (!check_form_security_token($typename, $formname)) {
@@ -344,4 +344,4 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
 		header('HTTP/1.1 403 Forbidden');
 		killme();
 	}
-}
\ No newline at end of file
+}