diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-01-06 17:10:09 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-01-06 17:10:09 +0000 |
| commit | 2413ed353d6bc8b8be53aa17f78c7960775eef45 (patch) | |
| tree | 620829e0f578a3c2602e72b0996e7bc1c83a2b97 /spec/controllers/request_controller_spec.rb | |
| parent | 2241acda80d5d17386989eba130623ffb5543e41 (diff) | |
| parent | 6c22c60b16f5653920ff894ca6732f539e4139a9 (diff) | |
Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5
Conflicts:
vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
Diffstat (limited to 'spec/controllers/request_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions