Merge branch 'master' into libotr4

This commit is contained in:
James Booth
2014-02-10 23:22:31 +00:00

View File

@@ -40,7 +40,7 @@ static gboolean data_loaded;
static OtrlPolicy static OtrlPolicy
cb_policy(void *opdata, ConnContext *context) cb_policy(void *opdata, ConnContext *context)
{ {
return OTRL_POLICY_DEFAULT ; return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2 ;
} }
static int static int