diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-05-15 11:59:12 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-05-15 11:59:12 +0100 |
| commit | 4051c158083577323a083448a37961daa52b2b11 (patch) | |
| tree | 8fd6687a7e0dce0ca1fbc5147cb1b78b45cc1443 /spec/controllers/user_controller_spec.rb | |
| parent | 27d2f37f362a344c0915b200a44f8fdb724c88e2 (diff) | |
| parent | b6d72220d3647e607fc9afad812faaba62e2ce17 (diff) | |
Merge remote-tracking branch 'origin/release/0.18' into rails-3-develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions