diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-22 12:04:42 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-22 12:04:42 -0300 |
| commit | b2d5983d83e35a0766c79134e47b71a4c82d9680 (patch) | |
| tree | 3d279ecf57bab16c71156848ee8c7eba3c07a827 /.gitattributes | |
| parent | fd4e5894201bff63253e969765908edb997c249a (diff) | |
| parent | 8c54836c146ac1870996b0d00e116332b9b3d0a5 (diff) | |
Merge remote-tracking branch 'ivan/bug/keyring-crash-on-wrong-password' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions