diff options
author | Louise Crow <louise.crow@gmail.com> | 2012-10-09 18:15:06 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2012-10-09 18:15:06 +0100 |
commit | 211fe84dc40d97df8aa8724906d9170ed4f78477 (patch) | |
tree | 30f5face0950bc7cceea1d2d3d01a43bd4e1a044 /app/controllers/api_controller.rb | |
parent | 54281fd50c3271835a54ab4bc08d40da09d643ee (diff) |
Revert "Merge remote-tracking branch 'henare_github/patch-1'"
Mistakenly merged into master. Please note that we'll want to merge this work into master on the next release, at which point we'll want to revert this reversion in order that the changes are properly re-applied.
This reverts commit 54281fd50c3271835a54ab4bc08d40da09d643ee, reversing
changes made to 793ca358c37458e6cc4385d2366621aaee93a25e.
Diffstat (limited to 'app/controllers/api_controller.rb')
0 files changed, 0 insertions, 0 deletions