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, 25 insertions, 25 deletions

diff --git a/templates/page.html b/templates/page.html
index 07eea62e..a7c6a300 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,25 +1,25 @@
-<!doctype html>

-<html>

-<head>

-	<meta charset="utf-8">

-	{% include 'header.html' %}

-	<title>{{ title }}</title>

-</head>

-<body>

-	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr>{% endif %}

-	<header>

-		<h1>{{ title }}</h1>

-		<div class="subtitle">

-			{% if subtitle %}

-				{{ subtitle }}

-			{% endif %}

-			{% if mod and not hide_dashboard_link %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}

-		</div>

-	</header>

-	{{ body }}

-	<hr>

-	<footer>

-		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>

-	</footer>

-</body>

-</html>

+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8">
+	{% include 'header.html' %}
+	<title>{{ title }}</title>
+</head>
+<body>
+	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr>{% endif %}
+	<header>
+		<h1>{{ title }}</h1>
+		<div class="subtitle">
+			{% if subtitle %}
+				{{ subtitle }}
+			{% endif %}
+			{% if mod and not hide_dashboard_link %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
+		</div>
+	</header>
+	{{ body }}
+	<hr>
+	<footer>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
+	</footer>
+</body>
+</html>