Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
enzolutions committed Jul 13, 2017
2 parents 9b63f4b + a3f6b7d commit eec1e94
Show file tree
Hide file tree
Showing 79 changed files with 275 additions and 185 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Drupal Console
=============================================

[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hechoendrupal/DrupalConsole)
[![Build Status](https://travis-ci.org/hechoendrupal/DrupalConsole.svg?branch=master)](https://travis-ci.org/hechoendrupal/DrupalConsole)
[![Build Status](https://travis-ci.org/hechoendrupal/drupal-console.svg?branch=master)](https://travis-ci.org/hechoendrupal/drupal-console)
[![Latest Stable Version](https://poser.pugx.org/drupal/console/v/stable.svg)](https://packagist.org/packages/drupal/console)
[![Latest Unstable Version](https://poser.pugx.org/drupal/console/v/unstable.svg)](https://packagist.org/packages/drupal/console)
[![Software License](https://img.shields.io/badge/license-GPL%202.0+-blue.svg)](https://packagist.org/packages/drupal/console)
Expand Down
126 changes: 63 additions & 63 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/services/theme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
lazy: true
console.theme_path:
class: Drupal\Console\Command\Theme\PathCommand
arguments: ['@console.extension_manager']
arguments: ['@console.extension_manager','@theme_handler']
tags:
- { name: drupal.command }
lazy: true
Expand Down
Loading

0 comments on commit eec1e94

Please sign in to comment.