diff options
| author | Scott Chacon <schacon@gmail.com> | 2012-05-03 22:38:47 +0400 |
|---|---|---|
| committer | Scott Chacon <schacon@gmail.com> | 2012-05-03 22:38:47 +0400 |
| commit | a29a1169e3e2e4b559253939dda9565f5c073417 (patch) | |
| tree | 43cf49677790c13a344a8e6f180453753a233398 /db | |
| parent | d9732d85b72f6393b1f2d46206a29deedfcaa5c7 (diff) | |
| parent | 303abe188f9f136b97e7c48edeba56665f0199b8 (diff) | |
Merge branch 'jason2'
Conflicts:
app/assets/stylesheets/reference.css.scss
app/views/site/index.html.haml
Diffstat (limited to 'db')
0 files changed, 0 insertions, 0 deletions