diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-08-15 11:33:26 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-08-15 11:33:26 -0300 |
commit | a9ddf49a05e3f6610dd5a96307c37fb4f4cf3d65 (patch) | |
tree | 24d4626674968746854d9d9e0cb21dc3126429c1 /server/changes/feature_3487-split-soledad-into-common-client-and-server | |
parent | 5513cbb2432255087cfff47f1a287cdd351b892e (diff) | |
parent | df8b3c9bcbb3659667f8a7e08de6ad9aaf527ff2 (diff) |
Merge remote-tracking branch 'drebs/feature/2601-use-pycryptopp' into develop
Diffstat (limited to 'server/changes/feature_3487-split-soledad-into-common-client-and-server')
0 files changed, 0 insertions, 0 deletions