diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-03-23 17:42:52 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-03-23 17:42:52 +0000 |
| commit | 2083062c2170915979b83056495f900059e4880a (patch) | |
| tree | a39337794fbae90debb49fb80625dd742615fdcc /spec/controllers/user_controller_spec.rb | |
| parent | b6cf3f88e9df1dda172f149927fa2a6cc4f3960a (diff) | |
| parent | 5486a2135689eb59b03da4f9f530b58fa270d676 (diff) | |
Merge branch 'translation-script' into rails-3-develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions