diff options
author | Kali Kaneko <kali@leap.se> | 2013-10-03 10:10:57 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-10-03 10:10:57 -0400 |
commit | 3597f2f043cbe78bb0c7dbc0be4778e2fe9cdd3f (patch) | |
tree | e45ec452a0f43cc7eebde01823521b9eab2c06b6 /.gitattributes | |
parent | d4192fce8317372869005ce2b5c455d10763e058 (diff) | |
parent | b9b7b244984111ec799675dc90073396481e6173 (diff) |
Merge remote-tracking branch 'chiiph/bug/choose_one_gnupg' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions