diff options
author | Louise Crow <louise.crow@gmail.com> | 2014-06-02 16:24:42 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2014-06-02 16:24:42 +0100 |
commit | 52099d889277948130a185a383313ad3f11ceb56 (patch) | |
tree | 8af57994f45227ebfbe524ad8ebebdb2e931ea22 /spec/controllers/user_controller_spec.rb | |
parent | e340ec13ce7aea11bce69511c603dfb793ee32c7 (diff) | |
parent | 01421efe2d069a71961e86bf0fcf743eaa5f5c4a (diff) |
Merge remote-tracking branch 'origin/password-change-subject-typo' into rails-3-develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions