From: Bernie Innocenti <codewiz@google.com>
Date: Sat, 27 Oct 2018 22:00:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'giskard/master'
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=refs%2Fremotes%2Fgiskard%2Fmaster;hp=425f8f9c7238697964956324b3809fc6a97e0378;p=geekigeeki.git

Merge remote-tracking branch 'giskard/master'
---

diff --git a/geekigeeki.conf.py b/geekigeeki.conf.py
index a9bad41..53181fb 100644
--- a/geekigeeki.conf.py
+++ b/geekigeeki.conf.py
@@ -10,7 +10,7 @@ site_icon = 'sys/favicon16x16.png'
 # set to None for read-only sites, or
 # leave empty ('') to allow anonymous edits
 # otherwise, set to a URL that requires authentication
-privileged_url = 'https://codewiz.org/wiki'
+privileged_url = 'https://www.codewiz.org/wikiedit'
 #privileged_url = ''
 #privileged_url = None
 
@@ -30,7 +30,7 @@ link_urls = [
     [ 'pavatar',         '/wiki/BernieAvatar80x80.png' ],
 ]
 
-history_url = '../wikigit/wiki.git'
+history_url = '../gitweb/wiki.git'
 
 post_edit_hook = os.path.join(script_path(), 'post_edit_hook.sh')