From: Jordan Augé Date: Wed, 27 Nov 2013 08:32:58 +0000 (+0100) Subject: Merge branch 'master' into scheduler X-Git-Tag: myslice-0.3-0~107 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8be9b358a544e1ea9e53ad40495fa42e9d5edf9a;hp=f0a4bb57d554387ad5d803bc1c00f16a2e2b371b;p=unfold.git Merge branch 'master' into scheduler --- diff --git a/plugins/googlemap/static/js/googlemap.js b/plugins/googlemap/static/js/googlemap.js index d3784b8a..0c511a08 100644 --- a/plugins/googlemap/static/js/googlemap.js +++ b/plugins/googlemap/static/js/googlemap.js @@ -27,10 +27,10 @@ googlemap_debug_detailed=false; this.in_set_backlog = []; // we keep a couple of global hashes - // lat_lon --> { marker,