diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-12 17:56:56 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-12 17:56:56 +0000 |
| commit | 5e400fd939091a12515b069d618b9e7b18bb4016 (patch) | |
| tree | 6d123ac3565bc5351a7c8fc94819e03460e7e0b9 /spec/controllers/admin_request_controller_spec.rb | |
| parent | cb020f57f9cec5610c40bbcb85257776c27642a1 (diff) | |
| parent | 0aafbd4a25b5c4c0edbd87c2224dcdd18388ede5 (diff) | |
Merge branch 'release/0.5' of https://github.com/sebbacon/alaveteli into release/0.5
Conflicts:
app/controllers/request_controller.rb
Diffstat (limited to 'spec/controllers/admin_request_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions