From: Tim Düsterhus <timwolla@arcor.de>
Date: Tue, 1 Jan 2013 22:49:20 +0000 (+0100)
Subject: Merge remote branch 'acp.style/master'
X-Git-Tag: 2.0.0_Beta_1~617
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=845907323978d1e5a5d499c4ca1224c8e6529af7;p=GitHub%2FWoltLab%2FWCF.git

Merge remote branch 'acp.style/master'

Conflicts:
	.travis.yml
---

845907323978d1e5a5d499c4ca1224c8e6529af7
diff --cc .travis.yml
index 785349a614,c25b47bbcb..8df00cd3a5
--- a/.travis.yml
+++ b/.travis.yml
@@@ -5,5 -5,7 +5,5 @@@ php
  before_install:
    - pear install pear/PHP_CodeSniffer
    - phpenv rehash
 -before_script:
 -  - git clone --branch=master --depth=1 --quiet git://github.com/WoltLab/WCF.git WCF
  script:
-   - phpcs -p --extensions=php --standard="`pwd`/CodeSniff/WCF" .
 -  - phpcs -p --extensions=php --standard="`pwd`/WCF/CodeSniff/WCF" files
++  - phpcs -p --extensions=php --standard="`pwd`/CodeSniff/WCF" .