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

Conflicts:
	js/inline-expanding.js

templates/mod/search_results.html

@@ -246,7 +246,7 @@
 				</td>
 				<td style="max-width:200px">
 					{% if post.file %}
-						<small>{{ post.file }} ({{ post.filesize | filesize }})</small>
+						<small>{{ post.filename }} ({{ post.filesize | filesize }})</small>
 					{% else %}
 						&ndash;
 					{% endif %}