diff options
| author | Francis Irving <francis@mysociety.org> | 2010-03-09 14:41:05 +0000 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2010-03-09 14:41:05 +0000 |
| commit | 7c5be5afbc8af5fa3ab504983e4f38c09c71e118 (patch) | |
| tree | e2167d321cb4ebff2fcf8f61aab6bc52532bb4c0 /spec/controllers/user_controller_spec.rb | |
| parent | 30bb6608984abdaf72350febc77fe9a982038138 (diff) | |
| parent | 9d1321cca685d4a25cdb615199ef464da3ba4d5d (diff) | |
Merge commit 'peter/master'
Conflicts:
config/environment.rb
Merge patch from Peter Collingbourne for handling Outlook attachments.
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions