diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-26 16:32:12 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-26 16:32:12 +0100 |
| commit | df5e41ebe0a26dcce321845593930955bead952c (patch) | |
| tree | 19c19e13831035a94d5055296580763e273c823b /app/controllers/api_controller.rb | |
| parent | 6db8ee1e2d952700cf12f9cf54573012a211f74a (diff) | |
| parent | b90a5f5df568dc68e971a7d43532b5163f6cd08e (diff) | |
Merge remote-tracking branch 'jpmckinney_github/class_methods' into rails-3-develop
Diffstat (limited to 'app/controllers/api_controller.rb')
0 files changed, 0 insertions, 0 deletions