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.

Sign up for GitHub

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

Jump to bottom

Imi fixes #1

Closed
wants to merge 8 commits into from
Closed

Imi fixes #1

wants to merge 8 commits into from

Commits on Mar 6, 2019

  1. rebase to magenerds-master

    klg committed Mar 6, 2019
    Configuration menu
    Copy the full SHA
    5f13fb2 View commit details
    Browse the repository at this point in the history

  2. reset

    klg committed Mar 6, 2019
    Configuration menu
    Copy the full SHA
    b869307 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2019

  1. Set new copyright year

    @sippsolutions
    sippsolutions committed May 6, 2019
    Configuration menu
    Copy the full SHA
    0405ef6 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2019

  1. Whitespace

    @sippsolutions
    sippsolutions committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    d1e6e4d View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2019

  1. Merge branch 'imi-fixes' of https://github.com/iMi-digital/BasePrice … 

    …into imi-fixes

Conflicts:
	Block/AfterPrice.php
	Model/Plugin/AfterPrice.php
	view/frontend/templates/afterprice.phtml
	view/frontend/templates/configurable/afterprice.phtml
    @bst2002git
    bst2002git committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    57983be View commit details
    Browse the repository at this point in the history

  2. .

    @bst2002git
    bst2002git committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    465226f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/tier-price' of https://github.com/iMi-digital/B… 

    …asePrice into imi-fixes

Conflicts:
	Block/AfterPrice.php
	Helper/Data.php
    @bst2002git
    bst2002git committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    d686cb8 View commit details
    Browse the repository at this point in the history

  4. .

    @bst2002git
    bst2002git committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    e19dbde View commit details
    Browse the repository at this point in the history