Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
wsajosh committed Jun 16, 2023
2 parents 1212b98 + 80386e9 commit 5bf0e1b
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 15 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG-PUBLIC.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ New release for marketplace
New release for marketplace


## v1.0.6 (2023-06-16)
Magento 2.4.6 Update


4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [v1.0.6](https://github.com/shipperhq/module-shipping-tracker/tree/v1.0.6) (2023-06-16)
[Full Changelog](https://github.com/shipperhq/module-shipping-tracker/-/compare/v1.0.5...develop)
- [MNB-3339](https://webshopapps.atlassian.net/browse/MNB-3339) Correction to phrasing in README [\#14](https://github.com/shipperhq/module-shipping-tracker/-/merge_requests/14) ([wsajason](https://gitlab.com/wsajason))

## [v1.0.5](https://github.com/shipperhq/module-shipping-tracker/tree/v1.0.5) (2022-06-20)
[Full Changelog](https://github.com/shipperhq/module-shipping-tracker/-/compare/v1.0.4...develop)

Expand Down
33 changes: 20 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,25 @@ Facts

Compatibility
-------------
- Magento >= 2.0 (Includes 2.2)
This module supports and is tested against the following Magento versions:

This library aims to support and is tested against the following PHP
implementations:
* 2.4.5-p1
* 2.4.5
* 2.4.4-p2
* 2.4.4-p1
* 2.4.4
* 2.4.3-p3
* 2.4.3-p2
* 2.4.3
* 2.4.2
* 2.4.1
* 2.4.0

* PHP 5.5
* PHP 5.6
* PHP 5.7
* PHP 7.x (Please consult [Magento 2 requirements](http://devdocs.magento.com/magento-system-requirements.html) for any exceptions)
per the [official Magento 2 requirements](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/system-requirements.html)

Enforced in the composer.json
Supports both Magento Opensource (Community) and Magento Commerce (Enterprise)

Compatibility with earlier editions is possible but not maintained.

Installation Instructions
-------------------------
Expand All @@ -46,14 +54,13 @@ Any contribution is highly appreciated. The best way to contribute code is to op

License
-------
Copyright (c) 2015 Zowta LLC & Zowta Ltd. See [LICENSE][] for
details.
Copyright (c) 2015 Zowta LLC & Zowta Ltd. See [license] for details.

We also dutifully respect the [Magento][] OSL license, which is included in this codebase.
We also dutifully respect the [Magento] OSL license, which is included in this codebase.


[license]: LICENSE.md
[magento]: Magento2_LICENSE.md
[license]: LICENSE.txt
[magento]: https://github.com/magento/magento2/blob/2.4-develop/LICENSE.txt

Copyright
---------
Expand Down
2 changes: 1 addition & 1 deletion src/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"AFL-3.0"
],

"version": "1.0.4",
"version": "v1.0.6",

"authors": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@
<title>ShipperHQ Tracker 5</title>
</shqtracker5>
</carriers>
<extension_version>v1.0.5</extension_version>
<extension_version>v1.0.6</extension_version>
</default>
</config>

0 comments on commit 5bf0e1b

Please sign in to comment.