summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-14 15:36:32 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-14 15:36:32 -0300
commite137a622440779acada41fe16a07bf4598645c06 (patch)
treeba5ac3ce859cfda7213b9c359e34bd2fc3be7da8 /CHANGELOG
parent4daab9b4bb279679611c1e4ec51c08f5987be27c (diff)
parentd88afefd26592f91edbf3f5a2eea165508ca4afa (diff)
Merge remote-tracking branch 'ivan/feature/advanced_key_management' into develop
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions