Skip to content

Merge with master#2

Merged
crysix merged 5 commits intocrysix:masterfrom
dweeves:master
Jan 18, 2016
Merged

Merge with master#2
crysix merged 5 commits intocrysix:masterfrom
dweeves:master

Conversation

@crysix
Copy link
Owner

@crysix crysix commented Jan 18, 2016

No description provided.

tantau-limora and others added 5 commits December 17, 2015 17:56
(cherry picked from commit 665f528d3f7b0a5be9bfca85f4a0ea22c9344fbb)

Conflicts:

	magmi/engines/magmi_productimportengine.php
without "$prefix" param, it fails in Line: 243 as $csvreader can not find the correct "filename" param
crysix added a commit that referenced this pull request Jan 18, 2016
@crysix crysix merged commit f296c57 into crysix:master Jan 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants