diff options
| author | Gregor Aisch <contact@vis4.net> | 2013-02-06 13:40:53 +0400 |
|---|---|---|
| committer | Gregor Aisch <contact@vis4.net> | 2013-02-06 13:40:53 +0400 |
| commit | 22d4f3ebddc54dace3ce67302475ada81f14c750 (patch) | |
| tree | 137b1d8e4ad1c0abaaf7c84a95dcc5a18ae84483 /.gitignore | |
| parent | 7e5256dbc98ac4b04246a723df7f32938752b3f2 (diff) | |
| parent | 84a2e9e92e909fa7d60abfde6c78e4f79ded4c6b (diff) | |
Merge remote-tracking branch 'upstream/master' into svg-map-widget
Conflicts:
.gitignore
plugins/UserCountryMap/Controller.php
plugins/UserCountryMap/UserCountryMap.php
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index a214bd7b79..89f016488d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ tmp/* *.buildpath config/config.ini.php .DS_Store +tests/PHPUnit/Integration/processed/ +tests/lib/visualphpunit/app/resource/cache/ +tests/results/ |