Merge remote-tracking branch 'mainline/develop' into MAGETWO-50998 (c1286009) · 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
c1286009

There was an error fetching the commit references. Please try again later.

Commit c1286009 authored 9 years ago by

Sergey Semenov

Downloads
- Plain Diff

Merge remote-tracking branch 'mainline/develop' into MAGETWO-50998

parents a1abfa73 6ea7d2d8

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml 2 additions, 2 deletions

...agento/Backend/view/adminhtml/templates/admin/login.phtml
app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml 1 addition, 0 deletions

...inhtml/Magento/backend/Magento_Backend/layout/default.xml
app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less 26 additions, 0 deletions

...agento/backend/Magento_Ui/web/css/source/_module-old.less
app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less 2 additions, 0 deletions

...nhtml/Magento/backend/web/css/source/forms/_controls.less
app/design/adminhtml/Magento/backend/web/css/styles-old.less 2 additions, 0 deletions

app/design/adminhtml/Magento/backend/web/css/styles-old.less
lib/web/jquery/jstree/jquery.jstree.js 578 additions, 578 deletions

lib/web/jquery/jstree/jquery.jstree.js

with 611 additions and 580 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