tree 5ac69a40875ee6778b59e03aca55d133dfc427f1
parent 760afb7fbafcbc7f4736a05ef7e04946d289e19a
parent cc56d39a0522909aabf5c32153c202b8f3d86c6a
author myrle-krantz <mkrantz@mifos.org> 1497009184 +0200
committer myrle-krantz <mkrantz@mifos.org> 1497009184 +0200

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