Merge remote-tracking branch 'origin/develop' into MAGETWO-57722 (9af6f5da) · 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
9af6f5da

Commit 9af6f5da authored 8 years ago by

Oleh Posyniak

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into MAGETWO-57722

parents 9efd622d 0353379f

Branches

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Gruntfile.js.sample 7 additions, 2 deletions

Gruntfile.js.sample
dev/tools/grunt/configs/clean.js 1 addition, 1 deletion

dev/tools/grunt/configs/clean.js
dev/tools/grunt/configs/combo.js 1 addition, 1 deletion

dev/tools/grunt/configs/combo.js
dev/tools/grunt/configs/exec.js 1 addition, 1 deletion

dev/tools/grunt/configs/exec.js
dev/tools/grunt/configs/less.js 1 addition, 1 deletion

dev/tools/grunt/configs/less.js
dev/tools/grunt/configs/watch.js 1 addition, 1 deletion

dev/tools/grunt/configs/watch.js
dev/tools/grunt/tools/files-router.js 83 additions, 0 deletions

dev/tools/grunt/tools/files-router.js
grunt-config.json.sample 3 additions, 0 deletions

grunt-config.json.sample

with 98 additions and 7 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