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

Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php

templates/post_form.html

@@ -85,6 +85,13 @@
 			</th>
 			<td>
 				<input type="file" name="file">
+				{% if config.allow_upload_by_url %}
+					<br>
+					<div style="float:none;text-align:left">
+						<label for="file_url">{% trans %}Or URL{% endtrans %}</label>: 
+						<input style="display:inline" type="text" id="file_url" name="file_url" size="35">
+					</div>
+				{% endif %}
 				{{ antibot.html() }}
 			</td>
 		</tr>