Merge branch 'develop' into pr2 (ff15af83) · Commits · KIII-12 / Magento · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

Magento
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

KIII-12
Magento
Commits
ff15af83

Commit ff15af83 authored 8 years ago by

Vadim Zubovich

Downloads
- Plain Diff

Merge branch 'develop' into pr2

parents 00cb7860 5a0cc81d

Branches

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/CatalogRule/Model/Rule.php 2 additions, 8 deletions

app/code/Magento/CatalogRule/Model/Rule.php
app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php 1 addition, 1 deletion

...code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
app/code/Magento/Usps/Model/Carrier.php 22 additions, 19 deletions

app/code/Magento/Usps/Model/Carrier.php
setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php 10 additions, 0 deletions

...p/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php

with 35 additions and 28 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment