Merge git://projects.archlinux.org/archweb

Conflicts:
	templates/public/index.html
	urls.py

1 files changed, 13 insertions, 0 deletions

diff --git a/todolists/urls.py b/todolists/urls.py
new file mode 100644
index 00000000..187d4820
--- /dev/null
+++ b/todolists/urls.py
@@ -0,0 +1,13 @@
+from django.conf.urls.defaults import patterns
+
+urlpatterns = patterns('todolists.views',
+    (r'^$',                       'list'),
+    (r'^(\d+)/$',                 'view'),
+    (r'^add/$',                   'add'),
+    (r'^edit/(?P<list_id>\d+)/$', 'edit'),
+    (r'^flag/(\d+)/(\d+)/$',      'flag'),
+    (r'^delete/(?P<object_id>\d+)/$',
+        'delete_todolist'),
+)
+
+# vim: set ts=4 sw=4 et: