Merge branch 'feature/csv-import' into develop

Browse Source

Conflicts:
	composer.json
	composer.lock
	resources/lang/en/form.php
	resources/lang/nl/form.php

...

This commit is contained in:

James Cole

2015-07-05 08:50:54 +02:00

parent 46493c2af6 9105104303

commit 74c50930bd

42 changed files with 2347 additions and 951 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

965

composer.lock generated

File diff suppressed because it is too large Load Diff