1
1
destroy_all
1
xy
1
a
a
Merge branch 'lee_edit' of github.com:satzcoal/GJD into lee_edit

Conflicts:
	app/models/info/customer_finance.rb
1
Merge branch 'lee_edit' of https://github.com/satzcoal/GJD into lee_edit
1
Merge pull request #11 from satzcoal/lee_edit

Lee edit