From a7f24851e2ddc5e97cce47904f4aa22ed2fbcc82 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Tue, 20 Mar 2018 17:42:48 +0800
Subject: [PATCH] [wiki] modification after rebase

---
 seahub/templates/wiki/wiki.html      | 2 +-
 seahub/templates/wiki/wiki_list.html | 2 +-
 seahub/wiki/urls.py                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/seahub/templates/wiki/wiki.html b/seahub/templates/wiki/wiki.html
index 0b3ba6db3a..d5725a38e3 100644
--- a/seahub/templates/wiki/wiki.html
+++ b/seahub/templates/wiki/wiki.html
@@ -60,7 +60,7 @@
 
 {% block extra_script %}{{block.super}}
 <script type="text/javascript" src="{{MEDIA_URL}}js/editormd/lib/marked.min.js"></script>
-<script type="text/javascript" src="{% static "scripts/lib/moment-with-locales.js" %}"></script> {# TODO: after 'upgrade-jquery', it shoulde be changed. #}
+<script type="text/javascript" src="{% static "scripts/lib/moment-with-locales.min.js" %}"></script>
 <script type="text/javascript">
 var renderer = new marked.Renderer();
 // remove 'id' attribute for headings
diff --git a/seahub/templates/wiki/wiki_list.html b/seahub/templates/wiki/wiki_list.html
index 1b0773f04a..107e16f023 100644
--- a/seahub/templates/wiki/wiki_list.html
+++ b/seahub/templates/wiki/wiki_list.html
@@ -68,7 +68,7 @@
 
 {% block extra_script %}{{block.super}}
 <script type="text/javascript" src="{% static "scripts/lib/underscore.js" %}"></script>
-<script type="text/javascript" src="{% static "scripts/lib/moment-with-locales.js" %}"></script> {# TODO: after 'upgrade-jquery', it shoulde be changed. #}
+<script type="text/javascript" src="{% static "scripts/lib/moment-with-locales.min.js" %}"></script>
 <script type="text/javascript">
 // get wiki list
 $.ajax({
diff --git a/seahub/wiki/urls.py b/seahub/wiki/urls.py
index 6d226e9fd2..71f4dc8ab4 100644
--- a/seahub/wiki/urls.py
+++ b/seahub/wiki/urls.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
 from django.conf.urls import url
 
-from .views import slug
+from .views import slug, wiki_list, edit_page
 
 urlpatterns = [
     url(r'^$', wiki_list, name='list'),