diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2012-07-04 11:12:33 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2012-07-04 11:12:33 +0100 |
commit | 88fc8f911f37f3771fa7c92f2a34156ef8d5b213 (patch) | |
tree | 1b50f6d467ea2210e0601f2466dc2bd5aa1d487c /spec/controllers/api_controller_spec.rb | |
parent | 525575961e656c812e7d1c2ab04b1fa0a351f6a2 (diff) | |
parent | d95a5eb0b6aaba3a0d88ab0f2fe4c948c051ecc9 (diff) |
Merge branch 'release/0.6.2' into develop
Diffstat (limited to 'spec/controllers/api_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions