From: Wolfram Schneider Date: Thu, 24 Apr 2014 14:46:59 +0000 (+0000) Subject: Merge remote branch 'origin/master' into wosch X-Git-Tag: 1.0.0~621^2~19 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=4a77b3e3ada83064127aa06aaf66dcb12bc2bcc7;hp=7e041f64182dd9d2ca88e4c3e61f4ffbcd1c4535;p=mkws-moved-to-github.git Merge remote branch 'origin/master' into wosch --- diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html index 6e5d7bb..9e9345e 100644 --- a/examples/htdocs/jasmine-local-popup.html +++ b/examples/htdocs/jasmine-local-popup.html @@ -50,7 +50,7 @@ var jasmine_config = { search_query: "netbsd", expected_hits: 10, - active_clients: 17, + // active_clients: 17, show_record_url: true }; diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html index 8d1cc67..91e770c 100644 --- a/examples/htdocs/jasmine-popup.html +++ b/examples/htdocs/jasmine-popup.html @@ -41,6 +41,7 @@