diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-05-15 17:07:10 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-05-15 17:07:10 +0100 |
| commit | 7b81696f53dfd80173183798171744b468921fef (patch) | |
| tree | 411228dc76df45be2a8e90aa2fc7b6b8bb6d5f8d /spec/controllers/user_controller_spec.rb | |
| parent | 4051c158083577323a083448a37961daa52b2b11 (diff) | |
| parent | 21027d0d1197e7ac447296ab68a25159860888b2 (diff) | |
Merge branch 'release/0.18' into rails-3-develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions