Commit a2b5f694 authored by Jason D Yeomans's avatar Jason D Yeomans
Browse files

Merge branch 'master' of

parents d310a7c8 3fad60ac
from django.conf.urls import patterns, include, url
from django_app import views
from django.contrib import admin
urlpatterns = patterns('',
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment