diff options
| author | Francis Irving <francis@mysociety.org> | 2009-12-04 14:33:17 +0000 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2009-12-04 14:33:17 +0000 |
| commit | 84c431e350bb65b713c18870425b974aa2fe773d (patch) | |
| tree | fe93e0199d343bfc856fabddbad729832acb4352 /spec/controllers/user_controller_spec.rb | |
| parent | 81fa07c4baa3f3ff01cdb5181d0870f20340cd5b (diff) | |
| parent | 3ffcf940f089f0d3c6a8cc9ca8c88803010bc415 (diff) | |
Merge branch 'master' into francis-profile-photo
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions