diff options
| author | Alban Gruin | 2017-11-06 08:21:35 +0100 | 
|---|---|---|
| committer | Alban Gruin | 2017-11-06 08:21:35 +0100 | 
| commit | 771f4ebb8f1e27212bfce413ea664a73c7a86965 (patch) | |
| tree | 2b0525b27ff4706ff8e4eff510b464c3cb86b9e2 /urls.py | |
| parent | 959bbaa5170aea4a9600d774280d44fc5107fdae (diff) | |
| parent | bafa5f07a4e1b5c2cc2bb234ad2f12929a983025 (diff) | |
Merge commit 'bafa5f07a4e1b5c2cc2bb234ad2f12929a983025'
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 4 | 
1 files changed, 2 insertions, 2 deletions
| @@ -13,12 +13,12 @@  #    You should have received a copy of the GNU Affero General Public License  #    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>. -from django.conf.urls import url +from django.conf.urls import include, url  from . import feeds, views  urlpatterns = [      url(r"^$", views.index, name="index"), -    url(r"^contact$", views.contact, name="contact"), +    url(r"^pages/", include("django.contrib.flatpages.urls")),      url(r"^(?P<year_slug>[-\w]+)/$", views.mention_list, name="mentions"),      url(r"^(?P<year_slug>[-\w]+)/(?P<timetable_slug>[-\w]+)/$", views.group_list, name="groups"),      url(r"^(?P<year_slug>[-\w]+)/(?P<timetable_slug>[-\w]+)/(?P<group_slug>[-\w]+)/$", views.timetable, name="timetable"), | 
