diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-05-20 17:49:54 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-05-20 17:49:54 +0200 |
| commit | 116456691dcb5484aaa8c11fb4d788a58177ac53 (patch) | |
| tree | fe4ebf66a69103211679f4d469b143e0e40d3fff /src/eu/siacs/conversations/entities/Contact.java | |
| parent | a5a356a7a7312c64d6d6c81ee773a36fe556233d (diff) | |
| parent | ff6e51356f2e76418ed71f19b7232c840a1b6bce (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/entities/Contact.java')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Contact.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/entities/Contact.java b/src/eu/siacs/conversations/entities/Contact.java index ff1459a5..22e2661b 100644 --- a/src/eu/siacs/conversations/entities/Contact.java +++ b/src/eu/siacs/conversations/entities/Contact.java @@ -286,5 +286,6 @@ public class Contact { public static final int ASKING = 2; public static final int PREEMPTIVE_GRANT = 4; public static final int IN_ROSTER = 8; + public static final int PENDING_SUBSCRIPTION_REQUEST = 16; } } |