This is an automated email from the ASF dual-hosted git repository. kmccusker pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-milagro-mfa-server.git
commit 6747f643256a0dac88b3c778ae6825858abe908e Merge: 9fa974f 4d12b66 Author: Nick Kew <[email protected]> AuthorDate: Thu Jul 14 11:03:22 2016 +0100 Merge https://github.com/miracl/milagro-mfa-server Conflicts: README.md .gitignore | 2 + README.md | 98 ++++++++++++++++++-------- install.sh | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/crypto.py | 6 +- 4 files changed, 293 insertions(+), 31 deletions(-)
