diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-11 17:23:42 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-11 17:23:42 -0500 |
| commit | 58fc4756e9822d39f224a8773209e306349146e0 (patch) | |
| tree | d326c593a6b859c8344410778c9e5cd3df436ebf /media/logos/apple-touch-icon-114x114.png | |
| parent | 2f35bd492629a52f4849c379f02030c1efb2495c (diff) | |
| parent | 422aaee026c57b65dda81b78b6a0f49263c6dd1e (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 'media/logos/apple-touch-icon-114x114.png')
0 files changed, 0 insertions, 0 deletions