diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-26 15:31:25 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-26 15:31:25 +0100 |
| commit | bd9de1079b46c0d96d38be44ae1667c0a340393b (patch) | |
| tree | 5871f4d6f72e4ff617e882ad013eb5d1d90f397d /app/controllers/api_controller.rb | |
| parent | 1e183ce535c81080affb7c185d27c9fe3fb17292 (diff) | |
| parent | 7e8e2b9c602527b07af7d15a17deb3df11730c24 (diff) | |
Merge remote-tracking branch 'petter_github/forgot-i18n-string' into rails-3-develop
Diffstat (limited to 'app/controllers/api_controller.rb')
0 files changed, 0 insertions, 0 deletions