diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-05-13 15:09:33 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-05-13 15:10:37 +0100 |
| commit | 13039b6f1ea7098eef7b28ff1c6fb242859dad16 (patch) | |
| tree | 247c420a52cefb9073fb1f6a25ccaec7e4f9d7d4 /spec/controllers/user_controller_spec.rb | |
| parent | 3194f4c43e6cbb081172a01c75066e6885f22ff2 (diff) | |
| parent | 0c7dcfad17bdcc73abbb31185ca5e7314aba76cd (diff) | |
Merge branch 'translation-fix' into rails-3-develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions