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 d84beade4462bf2aed47d84b71a1ca5248e430bf Merge: 6747f64 ae5dd05 Author: Simeon Aladjem <[email protected]> AuthorDate: Mon Aug 15 14:23:11 2016 +0300 Merge remote-tracking branch 'github-miracl/rps-new-mobile-app' servers/rps/config_default.py | 6 +++ servers/rps/mobile_flow.py | 106 ++++++++++++++++++++++++++++++++++++++++++ servers/rps/rps.py | 96 +++++++++++++++++++++++++++++--------- 3 files changed, 185 insertions(+), 23 deletions(-)
