diff options
| author | Kali Kaneko <kali@leap.se> | 2013-06-23 23:53:13 +0900 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-06-23 23:53:13 +0900 |
| commit | 53668de6f4ced844b10fc34fbc5ba77b00d54825 (patch) | |
| tree | 3d6be7573fcef2538aa59101250aff28a4921dbd /.gitattributes | |
| parent | b777dbfd4df7f4f0e4c2596fcc4000c2aba05a08 (diff) | |
| parent | 440f2036e36985e9536644b28af0e62cea8704eb (diff) | |
Merge remote-tracking branch 'chiiph/bug/disable_bad_keyring' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions