src/api/encryption_keys_get.c · 0c267e4e3d8d1e5ef239c72a588e4a2d15d5d969 · open / cryptops · GitLab

This is an archived project. Repository and other project resources are read-only.

Aug 22, 2017
63a06146
Merge branch 'master' into '21-free-memory' · 63a06146
Maarten de Waard authored Aug 22, 2017
```
# Conflicts:
#   src/api/encryption_init_post.c
```
63a06146
Merge branch 'master' into '21-free-memory'
Maarten de Waard authored Aug 22, 2017
```
# Conflicts:
#   src/api/encryption_init_post.c
```