diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-08-21 12:07:02 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-08-21 12:07:02 +0100 |
| commit | 8623e1a42478d3d531cb137329d3bad9698d45b1 (patch) | |
| tree | 0a0a0bd057e5f4d58be9af8c39cd92c3c7ff17a3 /app/controllers/api_controller.rb | |
| parent | bd4d027c4445d40e8af120774ca3c72a9e041d6d (diff) | |
| parent | a6ae5e1a0fd7378e70745bc61be206fc5941983d (diff) | |
Merge branch 'nginx-config-tweaks' into rails-3-develop
Diffstat (limited to 'app/controllers/api_controller.rb')
0 files changed, 0 insertions, 0 deletions