diff options
author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 15:05:37 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 15:05:37 +0100 |
commit | c8a203e221a55a5653596f5a8e092bd3877df9c4 (patch) | |
tree | 3de4ac1214eca2c12a357e5f338b0d3055e79721 /spec/controllers/request_controller_spec.rb | |
parent | e6dc0f6606b26e13cb0cd16124fdb2aad3c1b5a6 (diff) | |
parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) |
Merge branch 'release/0.6.7'
Conflicts:
locale/cs/app.po
locale/ro_RO/app.po
Diffstat (limited to 'spec/controllers/request_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions