Merge branch 'develop' of https://github.com/mifosio/rhythm into develop
authormyrle-krantz <mkrantz@mifos.org>
Fri, 19 May 2017 12:05:09 +0000 (14:05 +0200)
committermyrle-krantz <mkrantz@mifos.org>
Fri, 19 May 2017 12:05:25 +0000 (14:05 +0200)
commitb6117f67d917f86ab623b881e4b520ad65ab9de5
tree9f6ac55127a40f6f95c1b7d6d5c1a02a60d03e5e
parent3c0cfc73fa5a9fbbf85f8f2f03450b7e818c81ff
parentf9ef719a303edc0d6a7bde1998e4c7c4d9230ce9
Merge branch 'develop' of https://github.com/mifosio/rhythm into develop

# Conflicts:
# service/src/main/java/io/mifos/rhythm/service/RhythmConfiguration.java
service/src/main/java/io/mifos/rhythm/service/RhythmConfiguration.java