Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TASK] Added some magento-mirror versions and changed LokeyCoding to OpenMage #725

Merged
merged 1 commit into from
Nov 7, 2015

Conversation

fbrnc
Copy link
Contributor

@fbrnc fbrnc commented Nov 7, 2015

Fixes #724

@ktomk
Copy link
Collaborator

ktomk commented Nov 7, 2015

I have a similar one in the lineup (feature/magento-mirror) it's also taking care of the missing sample-data. I think it's otherwise close to yours. I just wait until the next build gets green, so please don't fix the build here yet.

@ktomk
Copy link
Collaborator

ktomk commented Nov 7, 2015

@fbrnc I just updated the develop branch. can you rebase your PR branch and check if you've got further changes? You might see many conflicts, they should be the same change on both sides, if not, this might signal a wrong change at someones end.

@ktomk
Copy link
Collaborator

ktomk commented Nov 7, 2015

@fbrnc I'll review, too. Just FYI.

@ktomk
Copy link
Collaborator

ktomk commented Nov 7, 2015

@fbrnc: I could resolve it. I'll merge and put it into develop. I hope it's green then.

@tkn98 tkn98 merged commit d157b03 into netz98:develop Nov 7, 2015
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