Merge remote-tracking branch 'origin/master' into issue-68

Conflicts:
	index.php
This commit is contained in:
Richard Underwood 2017-11-07 12:03:09 +00:00
commit 41d6d16a86
8 changed files with 60 additions and 30 deletions

View file

@ -36,7 +36,7 @@ if (isset($defaults['primaryns'])) {
}
if (!isset($logo) or empty($logo)) {
$logo = 'http://www.tuxis.nl/uploads/images/nsedit.png';
$logo = 'https://www.tuxis.nl/uploads/images/nsedit.png';
}