firefly-iii/database
James Cole 74c50930bd Merge branch 'feature/csv-import' into develop
Conflicts:
	composer.json
	composer.lock
	resources/lang/en/form.php
	resources/lang/nl/form.php
2015-07-05 08:50:54 +02:00
..
migrations Accounts can now have IBAN. 2015-07-03 12:54:35 +02:00
seeds Merge branch 'feature/csv-import' into develop 2015-07-05 08:50:54 +02:00
.gitignore Some cleaning up 2015-05-17 09:18:44 +02:00