summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-30 10:27:44 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-30 10:27:44 -0300
commit15fa6e076e03e82e17a113513e3588023058b72e (patch)
tree35727d59c51833cff032555eb3e74f3d29816646 /.gitignore
parent1f3573503be0cf7d61fa80ea866b8bef4a57b111 (diff)
parent114773067a962289d55b20c8c54df3747b9f75f1 (diff)
Merge remote-tracking branch 'drebs/feature/2683-move-keymanager-to-leap_client-2' into develop
Conflicts: setup.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions