Merge branch 'master' of github.com:okfn/recline

This commit is contained in:
Rufus Pollock 2013-05-04 20:46:38 +01:00
commit b861623981

View File

@ -5,7 +5,7 @@ this.recline.Backend.DataProxy = this.recline.Backend.DataProxy || {};
(function(my) {
my.__type__ = 'dataproxy';
// URL for the dataproxy
my.dataproxy_url = 'http://jsonpdataproxy.appspot.com';
my.dataproxy_url = '//jsonpdataproxy.appspot.com';
// Timeout for dataproxy (after this time if no response we error)
// Needed because use JSONP so do not receive e.g. 500 errors
my.timeout = 5000;