diff options
| author | James Booth <boothj5@gmail.com> | 2014-02-10 23:22:31 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-02-10 23:22:31 +0000 |
| commit | 202bd8296ee395921a00aa77524dd25c7919e6ca (patch) | |
| tree | 3f5e1fb6e0feee0bd07870b9eb1a6cf0017a7876 | |
| parent | 50afe7366e00767208fc9d17167a768cf924d6cb (diff) | |
| parent | 291c97747334f7b71ba600dba59679be74932e55 (diff) | |
| download | profani-tty-202bd8296ee395921a00aa77524dd25c7919e6ca.tar.gz | |
Merge branch 'master' into libotr4
| -rw-r--r-- | src/otr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/otr.c b/src/otr.c index fb8af681..f8e96283 100644 --- a/src/otr.c +++ b/src/otr.c @@ -40,7 +40,7 @@ static gboolean data_loaded; static OtrlPolicy cb_policy(void *opdata, ConnContext *context) { - return OTRL_POLICY_DEFAULT ; + return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2 ; } static int |