diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-02-06 14:48:51 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-02-06 14:48:51 +0000 |
| commit | 1f38d5a4fd641e94edb5ccb3402cb37a913a5ded (patch) | |
| tree | 9a0535d0b7b3480aa9abb71b60cc67131a748c20 /spec/controllers/admin_user_controller_spec.rb | |
| parent | b1f67230aa5ef1247187213f56116f6988114358 (diff) | |
| parent | a023c1af5cb65e0047811aae50a6c8cb31da4933 (diff) | |
Merge branch 'hotfix/0.20.0.8' into rails-3-develop
Conflicts:
config/initializers/alaveteli.rb
Diffstat (limited to 'spec/controllers/admin_user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions