diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-20 16:07:51 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-20 16:07:51 +0000 |
| commit | 05d7d032283647a3ee1e8631b089510b9ecfee14 (patch) | |
| tree | 66709569c9c7014bb1787db7b5e1274918db10f8 /spec/controllers/user_controller_spec.rb | |
| parent | fc9515ea08c3c53ef761e0a76e7704e7a23a1ee7 (diff) | |
| parent | a8bcbfb548f75635800205ae3cc56b69f731d10f (diff) | |
Merge remote-tracking branch 'stefan_github/develop' into develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions