tree 5884008d998fca37f2f8aef13fe99721b05ff3cd
parent 5b7dc8ba552edb0ef7f799f411a3a5bfede6c548
parent ef6dd4fc74b1c20c0d7d36000990956f70d310c1
author myrle-krantz <mkrantz@mifos.org> 1497274736 +0200
committer myrle-krantz <mkrantz@mifos.org> 1497274736 +0200

Merge branch 'develop' of https://github.com/mifosio/demo-server into develop