diff options
author | Justin Mayer <entroP@gmail.com> | 2013-04-21 11:12:41 -0700 |
---|---|---|
committer | Justin Mayer <entroP@gmail.com> | 2013-04-21 11:12:41 -0700 |
commit | 7112483f5385f54672d22a76a221b914b193ddf4 (patch) | |
tree | b0457aaefb86c39658fb8f28611db706596c2fbd /bootstrap/static/images | |
parent | 32128d2eef9484582d0bcce81469683e5b5a4b2a (diff) | |
parent | 25be494be81cbbc737ff3c4ab0a61fb2bcb16b04 (diff) | |
download | pelican-themes-7112483f5385f54672d22a76a221b914b193ddf4.tar.gz |
Merge pull request #93 from deBorn/master
Conflicts:
.gitmodules
Diffstat (limited to 'bootstrap/static/images')
0 files changed, 0 insertions, 0 deletions