diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-10 10:52:21 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-10 10:52:21 +0200 |
| commit | 15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (patch) | |
| tree | 9a2152390f39c4a9c79490a0938f57fe728140f2 /src/eu/siacs/conversations/Config.java | |
| parent | ae3ff5757d5d6e6e4359ecdefb6e98a9bd69c4a1 (diff) | |
| parent | 331be08859d68fa6a034b39c674fd7bb929c4a5c (diff) | |
Merge branch 'development'
Diffstat (limited to 'src/eu/siacs/conversations/Config.java')
| -rw-r--r-- | src/eu/siacs/conversations/Config.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/Config.java b/src/eu/siacs/conversations/Config.java index 1725eca6..a11e1763 100644 --- a/src/eu/siacs/conversations/Config.java +++ b/src/eu/siacs/conversations/Config.java @@ -10,7 +10,7 @@ public final class Config { public static final int PING_MIN_INTERVAL = 30; public static final int PING_TIMEOUT = 10; public static final int CONNECT_TIMEOUT = 90; - public static final int CARBON_GRACE_PERIOD = 60; + public static final int CARBON_GRACE_PERIOD = 120; public static final int AVATAR_SIZE = 192; public static final Bitmap.CompressFormat AVATAR_FORMAT = Bitmap.CompressFormat.WEBP; |