diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-05-15 18:30:15 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-05-15 18:30:15 +0100 |
| commit | 2273362d91ce5bf9b58748b3917000010b780fc1 (patch) | |
| tree | 77c8bff147f488dde3ef0e69f64c2752bf1a39d3 /spec/controllers/user_controller_spec.rb | |
| parent | 7b81696f53dfd80173183798171744b468921fef (diff) | |
| parent | 6f415fca07b438e4d4ca84e7c2efdee62db8ce48 (diff) | |
Merge branch 'hotfix/0.18.0.1' into rails-3-develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions