diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
| commit | b394b67663916c865452cc784d8642f72a305be5 (patch) | |
| tree | 63c92172fe7813e6354da0ead628ed2192ef0ee2 /spec/controllers/api_controller_spec.rb | |
| parent | 8d21293461ce4b564261686ab8d6460f5fe51259 (diff) | |
| parent | f83b917ec2c59da0ce7c27da19b740366da58419 (diff) | |
Merge branch 'release/0.8' into wdtk
Conflicts:
app/controllers/admin_request_controller.rb
app/views/contact_mailer/from_admin_message.rhtml
Diffstat (limited to 'spec/controllers/api_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions