summaryrefslogtreecommitdiffhomepage
path: root/sites/_shared_static/logo.png
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-02-14 09:39:38 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-02-14 09:39:38 -0800
commit3fcde4e7f419b57859d73bea86ce4c041912b2d3 (patch)
treefc0a7aa4398d8ba37adbe60620e2e794aaa337ab /sites/_shared_static/logo.png
parent6aada73b0ecc90861af19fbc2b8e86eb05b1f274 (diff)
parentfb786bea9cff8fba3c6852d216dbbcbafbbb524f (diff)
Merge branch '1.12'
Conflicts: sites/www/changelog.rst
Diffstat (limited to 'sites/_shared_static/logo.png')
0 files changed, 0 insertions, 0 deletions