diff options
author | Louise Crow <louise.crow@gmail.com> | 2015-02-16 15:38:16 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2015-02-16 15:38:16 +0000 |
commit | 18e22acb573bc48a7957ad64da4a8bcbee87ca39 (patch) | |
tree | 250a7062377d0933e89db40dc6a7951d3cd0a965 /spec/controllers/admin_user_controller_spec.rb | |
parent | 5f4d18a6daeeeff2a472d533842e33c728604d35 (diff) | |
parent | 94e211bc26e40d848780e072356af99318aab930 (diff) |
Merge branch 'hotfix/0.20.0.13' into rails-3-develop
Diffstat (limited to 'spec/controllers/admin_user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions