diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:10:46 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:10:46 -0400 |
| commit | 05a44e86fbb656e5a4f6228c28b61df740549b34 (patch) | |
| tree | 4d272046b88cd07f82d48da8a2390d785ace96c5 /sitestatic/logos/icon-transparent-64x64.png | |
| parent | c6eb3b7b3c77d1b70126e0755c9ee66de88d5395 (diff) | |
| parent | 67b87ed4c0abd593e2833b3aa6b969c2e2451b60 (diff) | |
Merge branch 'archweb-generic' into master-nomake
# Conflicts:
# local_settings.py.example
Diffstat (limited to 'sitestatic/logos/icon-transparent-64x64.png')
0 files changed, 0 insertions, 0 deletions