tree 07d3852e647f5c5954a4351e154e545ae44fe7ef
parent 4c7d3f4e5659995056ec7a7c9eae3a8ae1670a86
parent 8960abcb76eeded5267e107ecbb1f5ce14311175
author myrle-krantz <mkrantz@mifos.org> 1497625191 +0200
committer myrle-krantz <mkrantz@mifos.org> 1497625191 +0200

Merge branch 'develop' of https://github.com/mifosio/portfolio into develop