Skip to content

Conversation

@grayside
Copy link
Contributor

No description provided.

Copy link
Contributor Author

@grayside grayside left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not delete original composer.json

@grayside grayside added this to the 2.0.0 milestone Jan 8, 2018
…er-from-root

* origin/master:
  Update dependencies to enable Greenkeeper 🌴 (#322)
  Drop PHP 5.5 and Node 4, 5, and 7 (#345)
  Add conflict with behat >= v3.4 (#343)
  Add cli service to docker-compose.
  Add support for docker-based test execution.
  Add documentation on local testing & development.
  Correct path of the config.serve.concurrent configuration
  add missing semicolon
  fix githooks task to properly merge in configured tasks from Gruntconfig.json
@grayside
Copy link
Contributor Author

Merging this now on the basis of it's completely broken as-is.

@grayside grayside merged commit 7341983 into master Feb 27, 2018
grayside pushed a commit that referenced this pull request Feb 27, 2018
…-arg

* origin/master:
  For Drupal 8 packaging, loading composer.json from repo root. (#331)
  Update dependencies to enable Greenkeeper 🌴 (#322)
  Drop PHP 5.5 and Node 4, 5, and 7 (#345)
  Add conflict with behat >= v3.4 (#343)
  Add cli service to docker-compose.
  Add support for docker-based test execution.
  Add documentation on local testing & development.
  add missing semicolon
  fix githooks task to properly merge in configured tasks from Gruntconfig.json
@grayside grayside modified the milestones: 2.0.0, 1.1.0 Feb 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants