diff options
| author | jessib <jessib@leap.se> | 2013-07-04 12:25:12 -0700 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-04 12:25:12 -0700 |
| commit | b1a7a700d214508bce1ddd13d80191c309ca17c5 (patch) | |
| tree | f72a10ee2596e0d6d0d4b57bb6cac0a317bc5553 /users/app/controllers/users_controller.rb | |
| parent | 6c413d3b0c4f9343fe35dbd6ad65b87dca4b4831 (diff) | |
| parent | d03e82b4df5075f796f56fb9568992b0ba0d7c07 (diff) | |
Merge branch 'master' into feature/disable_account
Diffstat (limited to 'users/app/controllers/users_controller.rb')
0 files changed, 0 insertions, 0 deletions