Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
	inc/image.php
	js/expand.js
	js/hide-threads.js
	js/local-time.js
	js/smartphone-spoiler.js
	templates/header.html
	templates/index.html
	templates/main.js
	templates/page.html
	templates/post_reply.html
	templates/post_thread.html
	templates/thread.html

1 files changed, 26 insertions, 26 deletions

diff --git a/templates/mod/login.html b/templates/mod/login.html
index 43a28d56..476897a6 100644
--- a/templates/mod/login.html
+++ b/templates/mod/login.html
@@ -1,26 +1,26 @@
-{% if error %}<h2 style="text-align:center">{{ error }}</h2>{% endif %}

-<form action="" method="post">

-<table style="margin-top:25px;">

-	<tr>

-		<th>

-			{% trans 'Username' %}

-		</th>

-		<td>

-			<input type="text" name="username" size="20" maxlength="30" value="{{ username|e }}">

-		</td>

-	</tr>

-	<tr>

-		<th>

-			{% trans 'Password' %}

-		</th>

-		<td>

-			<input type="password" name="password" size="20" maxlength="30" value="">

-		</td>

-	</tr>

-	<tr>

-		<td></td>

-		<td>

-			<input type="submit" name="login" value="{% trans %}Continue{% endtrans %}" />

-		</td>

-</table>

-</form>

+{% if error %}<h2 style="text-align:center">{{ error }}</h2>{% endif %}
+<form action="" method="post">
+<table style="margin-top:25px;">
+	<tr>
+		<th>
+			{% trans 'Username' %}
+		</th>
+		<td>
+			<input type="text" name="username" size="20" maxlength="30" value="{{ username|e }}">
+		</td>
+	</tr>
+	<tr>
+		<th>
+			{% trans 'Password' %}
+		</th>
+		<td>
+			<input type="password" name="password" size="20" maxlength="30" value="">
+		</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td>
+			<input type="submit" name="login" value="{% trans %}Continue{% endtrans %}" />
+		</td>
+</table>
+</form>