diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-03-10 12:21:36 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-03-10 12:21:36 +0000 |
| commit | 4068c20d3218165fd9db085c2fa0465db799ee8f (patch) | |
| tree | 7f479e7401a9ea392cf4b083d603a8986b3e3a01 /spec/controllers/user_controller_spec.rb | |
| parent | ca683c4e9801dab4c7eee408f50032a504ee1a5b (diff) | |
fix bad merges from rebase with master
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions