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

[3.0.x.x maintenance] Added more fixes from Github+Timezone from Master #8096

Merged
merged 3 commits into from Jul 21, 2020
Merged

[3.0.x.x maintenance] Added more fixes from Github+Timezone from Master #8096

merged 3 commits into from Jul 21, 2020

Conversation

condor2
Copy link
Contributor

@condor2 condor2 commented Jul 20, 2020

No description provided.

@danielkerr danielkerr merged commit 3cca96c into opencart:3.0.x.x_Maintenance Jul 21, 2020
@danielkerr
Copy link
Member

please dont commit so much at once. just small clear fixes. 1 fix at a time you could say.

@condor2
Copy link
Contributor Author

condor2 commented Jul 21, 2020

ok

@ADDCreative
Copy link
Contributor

@condor2 Also some of the commit is wrong. The change of text_sent to upload/admin/language/en-gb/mail/voucher.php from upload/admin/language/en-gb/sale/voucher.php is wrong. You can read my explanation as to why and how to fix correctly in my comment of a bad commit that was merged into the master branch here #5864 (comment).

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.

None yet

3 participants