Merge branch 'xorg/master' into xorg/f/geocoding

[platal.git] / htdocs / javascript / .gitignore

diff --git a/htdocs/javascript/.gitignore b/htdocs/javascript/.gitignore
index 85fe6a4..47ad449 100644 (file)
--- a/htdocs/javascript/.gitignore
+++ b/htdocs/javascript/.gitignore
@@ -4,4 +4,5 @@
 # jQuery and its plugins are downloaded by the Makefile
 /jquery*.*js
 /core.js
+/json2.js
 !/jquery.autocomplete.js