summaryrefslogtreecommitdiff
path: root/urls.py
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-17 18:02:33 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-05-17 18:02:33 -0400
commit198f25b93c7b9ce4cad693a9654872a7fa80dca6 (patch)
tree15bc64153c76037a595844b26f80f29dbb125601 /urls.py
parent59e4850d2a0427b3598a66d612b1812a37d2e002 (diff)
parent442a2b1a9cf8e3ca0c22b3d52397e7d9b5a6fecc (diff)
Merge branch 'archweb-generic'
# Conflicts: # templates/public/index.html
Diffstat (limited to 'urls.py')
0 files changed, 0 insertions, 0 deletions