diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-10-07 16:09:46 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-10-07 16:09:46 -0300 |
| commit | dff590ed62efd8393f6603842ff9da239e6811f5 (patch) | |
| tree | e001991ff37c28f79c96810fe6c7044c9fe41316 /LICENSE | |
| parent | 5a18b7f70a03576ade7a1023a498fe58db703ea0 (diff) | |
| parent | cf32f8bd5685114310c8dd6ce1368f230ed643a6 (diff) | |
Merge remote-tracking branch 'meskio/feature/keymanager_api' into develop
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions