chiark / gitweb /
~mdw / catacomb-python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d67d49b 1d93191)
Merge remote-tracking branch 'origin/HEAD'
authorMark Wooding <mdw@distorted.org.uk>
Fri, 7 Jul 2017 20:18:42 +0000 (21:18 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 7 Jul 2017 20:18:42 +0000 (21:18 +0100)
* origin/HEAD:
  catacomb/pwsafe.py: Fix stupid error which breaks `delete'.


Trivial merge
Catacomb cryptographic library -- Python bindings