diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-02-03 13:39:24 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-02-03 13:39:24 +0000 |
| commit | bf4bbc351dae8e97d09b87434cef4f44eea4d73a (patch) | |
| tree | 2f43c9c02205fec1fb68cdcb66735d5b1ee3172f /spec/controllers/user_controller_spec.rb | |
| parent | ea04caec95cea132143997a1870ae8dd1fc0db5c (diff) | |
| parent | 14b5be69dc2dc3c4dd817feb0b5a8402fc343db4 (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions