diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-18 15:42:53 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-18 15:42:53 +0000 |
| commit | bbdcb09cb9eeb94e3244a22b1129a1e9521947f4 (patch) | |
| tree | 4ad15f4138796087c32957261e8b9e7b6f59887b /app/controllers/user_controller.rb | |
| parent | 5cfcdaac505e60914ee4398cfe431bd5d21b58ed (diff) | |
| parent | abdc92fd922dd82da85f7c00bdb50e85ed047714 (diff) | |
Merge branch 'restful-admin-routes' into rails-3-develop
Diffstat (limited to 'app/controllers/user_controller.rb')
0 files changed, 0 insertions, 0 deletions