diff options
| author | Brandon Mathis <brandon@imathis.com> | 2011-09-04 08:37:22 -0500 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2011-09-04 08:37:22 -0500 |
| commit | ed0c220523f81a9f29009f8bbb75ff50052465d4 (patch) | |
| tree | ed925f206fc9d72fe806856a07525ec0118a3972 /config.rb | |
| parent | 3cedd387a0fd4522023ef335307cbc096a3c2005 (diff) | |
| parent | f03c4cdb2abe524e097fdfc67194e8d9fc0d19ab (diff) | |
| download | my_new_personal_website-ed0c220523f81a9f29009f8bbb75ff50052465d4.tar.xz my_new_personal_website-ed0c220523f81a9f29009f8bbb75ff50052465d4.zip | |
Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master
Conflicts:
plugins/category_generator.rb
Diffstat (limited to 'config.rb')
0 files changed, 0 insertions, 0 deletions