diff options
| author | Stefan Giehl <stefan@linux-me53.site> | 2013-02-06 12:09:08 +0400 |
|---|---|---|
| committer | Stefan Giehl <stefan@linux-me53.site> | 2013-02-06 12:09:08 +0400 |
| commit | e14fd739a38627ad298701472a95e560a25dc9a8 (patch) | |
| tree | e83827453b73ea660a7abc74de8c03c0f7a40edd /.gitignore | |
| parent | 74ff8ea4d5af124f1c9502756ddf57a665d11883 (diff) | |
| parent | 84a2e9e92e909fa7d60abfde6c78e4f79ded4c6b (diff) | |
Merge branch 'master' of github.com:piwik/piwik
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 39cea62459..e09a297d45 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ tmp/* *.db *.buildpath config/config.ini.php -tests/PHPUnit/Integration/processed/* tests/PHPUnit/phpunit.xml -tests/lib/visualphpunit/app/resource/cache/* +tests/PHPUnit/Integration/processed/ +tests/lib/visualphpunit/app/resource/cache/ +tests/results/ |