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