diff options
| author | Brandon Mathis <brandon@imathis.com> | 2011-09-08 10:31:36 -0500 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2011-09-08 10:31:36 -0500 |
| commit | 71ad7185bc10b1fda8983fa73d195adb37654639 (patch) | |
| tree | 3a0f3444842c2e102f50214dfee5edc6937ac0ca /.gitattributes | |
| parent | a289c909092ff025e7444fa73b4039d112ecbce8 (diff) | |
| parent | 423e8ecbda0394d4c77e2ea659768a8f30c35018 (diff) | |
| download | my_new_personal_website-71ad7185bc10b1fda8983fa73d195adb37654639.tar.xz my_new_personal_website-71ad7185bc10b1fda8983fa73d195adb37654639.zip | |
Merge branch 'sinatra_static_server' of https://github.com/scottwater/octopress into scottwater-sinatra_static_server
Conflicts:
Gemfile
Gemfile.lock
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions