diff options
| author | Azul <azul@leap.se> | 2013-03-05 13:35:05 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-03-05 13:35:05 +0100 |
| commit | 27c16ccceffa1d8eaaf02612cf29a60bfe6ced01 (patch) | |
| tree | 1df9d9900872cf2e97d5c27b4175816eff5cbf80 /.gitignore | |
| parent | 733426aa3992dafaf1c58ede7e74018057a01148 (diff) | |
| parent | 87c306ea212c01ecc8f98009def5971fc4d5af11 (diff) | |
Merge branch 'master' into feature/limit_user_leak
Conflicts:
users/lib/warden/strategies/secure_remote_password.rb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -27,3 +27,4 @@ public/ca.crt public/config/* public/provider.json config/config.yml +bin |