merge conflicts
authorSteven Tobin <steventtobin (at) gmail.com>
Mon, 19 Feb 2018 22:59:12 +0000 (22:59 +0000)
committerSteven Tobin <steventtobin (at) gmail.com>
Mon, 19 Feb 2018 22:59:12 +0000 (22:59 +0000)
commitdbbf1f15bf908aadbf16f9503b46784d11bd2d1c
tree81b602aa5d037cfa85b3a117fa67387f037c5bb6
parentd242c6f44333561873092347a9edf2b961516604
merge conflicts
.gitignore
README.rst
tests/test_xkcdpass.py
xkcdpass/xkcd_password.py
git clone https://git.99rst.org/PROJECT