diff options
author | Gregor Aisch <contact@vis4.net> | 2013-02-07 22:17:45 +0400 |
---|---|---|
committer | Gregor Aisch <contact@vis4.net> | 2013-02-07 22:17:45 +0400 |
commit | ddbe5e19c276d9ca5ea3e8897c30ad5ea164bf95 (patch) | |
tree | 08b67b30829d4065cf38d32a9f862160789ee4c2 /.gitignore | |
parent | f41dfbb00db84b17a40dfd4ce5088deb4475eddf (diff) | |
parent | a12a968e3898c9a06d43426163760243b58a18b6 (diff) |
Merge remote-tracking branch 'upstream/master' into svg-map-widget
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 89f016488d..9b25a3cfff 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ config/config.ini.php tests/PHPUnit/Integration/processed/ tests/lib/visualphpunit/app/resource/cache/ tests/results/ +tests/lib/geoip-files/ |