Skip to content

Commit 6ae8b47

Browse files
author
Benjamin Pearson
committed
Merge branch 'master' into phar
Conflicts: CodeSniffer.php CodeSniffer/DocGenerators/Generator.php CodeSniffer/Reporting.php
2 parents 8e4bdb2 + 7649355 commit 6ae8b47

92 files changed

Lines changed: 2589 additions & 3656 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ language: php
33
php:
44
- 5.3
55
- 5.4
6+
- 5.5
67

78
script:
89
- phpunit tests/AllTests.php

0 commit comments

Comments
 (0)