Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts: stylesheets/dark_roach.css stylesheets/style.css
This commit is contained in:
@@ -357,6 +357,8 @@
|
||||
// Allow "uploading" images via URL as well. Users can enter the URL of the image and then Tinyboard will
|
||||
// download it. Not usually recommended.
|
||||
$config['allow_upload_by_url'] = false;
|
||||
// The timeout for the above, in seconds.
|
||||
$config['upload_by_url_timeout'] = 15;
|
||||
|
||||
// A wordfilter (sometimes referred to as just a "filter" or "censor") automatically scans users’ posts
|
||||
// as they are submitted and changes or censors particular words or phrases.
|
||||
|
Reference in New Issue
Block a user