Vishwas Babu A J 5a21aa6bfd Merge branch 'MIFOSX-1638' of git://github.com/emmanuelnnaa/mifosx into emmanuelnnaa-MIFOSX-1638 ...

Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java

2014-11-20 06:00:32 +05:30

..

integrationTest/java/org/mifosplatform/integrationtests

Merge branch 'MIFOSX-1068' of git://github.com/Nayan/mifosx into Nayan-MIFOSX-1068

2014-11-13 21:35:54 +05:30

main

Merge branch 'MIFOSX-1638' of git://github.com/emmanuelnnaa/mifosx into emmanuelnnaa-MIFOSX-1638

2014-11-20 06:00:32 +05:30

test

merging localization changes for dates in unit test cases

2014-10-03 10:41:34 -07:00