Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

1 files changed, 6 insertions, 5 deletions

diff --git a/assets/css/src/form.css b/assets/css/src/form.css
index 24dcb0fc..e42b345b 100644
--- a/assets/css/src/form.css
+++ b/assets/css/src/form.css
@@ -146,11 +146,6 @@ input.form-input-large {
     width: 400px;
 }
 
-.form-row {
-    margin-top: 10px;
-    margin-bottom: 20px;
-}
-
 .form-column {
     float: left;
     margin-right: 3%;
@@ -161,6 +156,12 @@ input.form-input-large {
     margin-top: 15px;
 }
 
+.form-clear {
+    clear: both;
+    padding-top: 20px;
+    padding-bottom: 10px;
+}
+
 .form-login {
     width: 350px;
     margin: 0 auto;