diff options
| author | Robin Houston <robin@lenny.robin> | 2011-09-07 21:07:56 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-09-07 21:07:56 +0100 |
| commit | f4749248c1f558970b17386f646392c3c82c42b3 (patch) | |
| tree | ff32928cb69636bf8f3fab790817751722cc9796 /spec/controllers/user_controller_spec.rb | |
| parent | b9c785535a020c0bc1b871bca48cee71aa2143d9 (diff) | |
| parent | 1719d5a8e17b8974ecd0ef43624a719020dd7f53 (diff) | |
Merge branch 'wdtk' of git@github.com:sebbacon/alaveteli into wdtk
Conflicts:
script/handle-mail-replies
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions