diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-23 17:49:01 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-23 17:49:01 +0100 |
| commit | 5ea4882f38bcf18016c82c1e6119c4df5237e96e (patch) | |
| tree | a393c38b8b4273eee7f4a693c6f4c7a7bd55266f /spec/controllers/admin_general_controller_spec.rb | |
| parent | db8bb7fa5440855420b8f3ce24611a766e52f89e (diff) | |
| parent | a311a1892507aacec5bfb2837dd10f5257dfb42c (diff) | |
Merge remote-tracking branch 'origin/release/0.6.4' into wdtk
Conflicts:
app/views/request/show.rhtml
spec/models/info_request_spec.rb
Diffstat (limited to 'spec/controllers/admin_general_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions