diff options
| author | Stefan Giehl <stefan@linux-me53.site> | 2013-02-05 14:15:46 +0400 |
|---|---|---|
| committer | Stefan Giehl <stefan@linux-me53.site> | 2013-02-05 14:15:46 +0400 |
| commit | 8ae9009a154d222fe6b9956000e0e57566a74060 (patch) | |
| tree | 895f5cb6d060a42f0b7f0ea3d89acab0ac026cbe /.gitignore | |
| parent | 12c96d0600433fdd5580d4fd74d11c908cebaa88 (diff) | |
| parent | 62efc03f8fcaca01b64a4a91f9987f6f118ca6f2 (diff) | |
Merge branch 'master' of github.com:piwik/piwik
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index d62c8e9c86..39cea62459 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,7 @@ tmp/* *.tmp *.db *.buildpath -phpunit.xml -config.ini.php
\ No newline at end of file +config/config.ini.php +tests/PHPUnit/Integration/processed/* +tests/PHPUnit/phpunit.xml +tests/lib/visualphpunit/app/resource/cache/* |