diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-19 13:53:24 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-19 13:53:24 +0000 |
| commit | 79c39c2a493824590c1862816649bc62e718fe19 (patch) | |
| tree | 1b51e901f4aa4fd6c72e6ecbd3563fc07b27e1eb /spec/controllers/user_controller_spec.rb | |
| parent | 22b2db48c005be1d1b87dd6b58f830a2a74d2108 (diff) | |
| parent | bf66cd1d1d4faa249c692f13543e43f2bd6b0c03 (diff) | |
Merge branch 'wdtk' of https://github.com/sebbacon/alaveteli into wdtk
Conflicts:
app/controllers/application_controller.rb
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions