Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	media/archweb.css
	public/views.py
	urls.py

1 files changed, 10 insertions, 0 deletions

diff --git a/mirrors/urls.py b/mirrors/urls.py
new file mode 100644
index 00000000..fed9c807
--- /dev/null
+++ b/mirrors/urls.py
@@ -0,0 +1,10 @@
+from django.conf.urls.defaults import patterns
+
+urlpatterns = patterns('mirrors.views',
+    (r'^$',                     'mirrors', {}, 'mirror-list'),
+    (r'^status/$',              'status',  {}, 'mirror-status'),
+    (r'^status/json/$',         'status_json',  {}, 'mirror-status-json'),
+    (r'^(?P<name>[\.\-\w]+)/$', 'mirror_details'),
+)
+
+# vim: set ts=4 sw=4 et: