summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-12-11 17:23:42 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-12-11 17:23:42 -0500
commit58fc4756e9822d39f224a8773209e306349146e0 (patch)
treed326c593a6b859c8344410778c9e5cd3df436ebf /public
parent2f35bd492629a52f4849c379f02030c1efb2495c (diff)
parent422aaee026c57b65dda81b78b6a0f49263c6dd1e (diff)
Merge branch 'archweb-generic'lukeshu/netboot
# Conflicts: # AUTHORS # Makefile # public/views.py # settings.py # templates/public/donate.html # templates/public/download.html # templates/public/index.html
Diffstat (limited to 'public')
0 files changed, 0 insertions, 0 deletions