diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-31 09:34:00 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-31 09:34:00 +0000 |
| commit | 8c8fd338a5ea811040afe3f837e2f9a826eaa1a0 (patch) | |
| tree | 0df5d15ee7581c7fca7c56a36f517a9d1b29dd72 /spec/controllers/application_controller_spec.rb | |
| parent | deaede70df7cf68f380e00f01950b48c0e73a4fa (diff) | |
| parent | e19b4494d1a8901ab60dd5ea7fa116d7c799a92b (diff) | |
Merge branch 'feature/flexible-admin-username' into develop
Diffstat (limited to 'spec/controllers/application_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions