Skip to content

Commit

Permalink
Merge branch 'PatchRanger-php-cs-fixer' of https://github.com/PatchRa…
Browse files Browse the repository at this point in the history 
…nger/mautic into PatchRanger-PatchRanger-php-cs-fixer

# Conflicts:
#	composer.lock
  • Loading branch information
@alanhartless
alanhartless committed Sep 30, 2016
1 parent 6e5acde commit 8f65fbd
Showing 1 changed file with 60 additions and 2 deletions.
62 changes: 60 additions & 2 deletions composer.lock
View file

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

0 comments on commit 8f65fbd

Please sign in to comment.