diff options
| author | jessib <jessib@riseup.net> | 2013-08-01 10:52:04 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-08-01 10:52:04 -0700 |
| commit | 368dbc55966b2b74699065e07de28fe321f286b6 (patch) | |
| tree | 7c03bf78596e9e2a7735518ba713eaacd864a975 /core | |
| parent | 3578c13abd86d15ca6310bf5652f4855a8daa1a8 (diff) | |
| parent | 1a3fdad01d9cb2e2596281d38ce0c0f1ad4da04a (diff) | |
Merge branch 'master' into billing_with_tests
Conflicts:
app/views/home/index.html.haml
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions