Merge https://github.com/miracl/milagro-mfa-server
Conflicts:
README.md
Project:
http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-server/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-server/commit/6747f643
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-server/tree/6747f643
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-server/diff/6747f643
Branch: refs/heads/master
Commit: 6747f643256a0dac88b3c778ae6825858abe908e
Parents: 9fa974f 4d12b66
Author: Nick Kew <[email protected]>
Authored: Thu Jul 14 11:03:22 2016 +0100
Committer: Nick Kew <[email protected]>
Committed: Thu Jul 14 11:03:22 2016 +0100
----------------------------------------------------------------------
.gitignore | 2 +
README.md | 98 +++++++++++++++++-------
install.sh | 218 +++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/crypto.py | 6 +-
4 files changed, 293 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-server/blob/6747f643/README.md
----------------------------------------------------------------------
