tree aab7e8dafad08e5e5fdf67c3d46541417aadb4c1
parent bc1469ef9b29f98a61f790498267c1699b708afb
parent 68fd63cff087f1893b2f3fff6db44f58b295bd12
author mgeiss <mgeiss@mifos.org> 1492144910 +0200
committer mgeiss <mgeiss@mifos.org> 1492144910 +0200

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