diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-02-05 11:05:30 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-02-05 11:05:30 +0000 |
| commit | 865e1c044f0010284bb26fd59d7b55870b0a4155 (patch) | |
| tree | 40fbcdcb5c67a9a1baa4545c0392550b514c2e0f /spec/controllers/admin_user_controller_spec.rb | |
| parent | 37bb96707f5e17cd59d9b5be950e4304f779ec81 (diff) | |
| parent | 1a8f912700430d58ad0827082adb2692e4f02e88 (diff) | |
Merge branch 'hotfix/0.20.0.6' into rails-3-develop
Conflicts:
spec/models/public_body_spec.rb
Diffstat (limited to 'spec/controllers/admin_user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions