diff options
| author | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
| commit | 95e2a539517c27b3235acd582f17968c8e301e81 (patch) | |
| tree | 213bbeed798751e949376d85f4d7d0bd30c5fbfa /docs/XEPs.md | |
| parent | 48717dd7d37c066ab626fc626a2ced626ef21d42 (diff) | |
| parent | 4f4eff2353f4e359b5582c8e808a4e88631c3e74 (diff) | |
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts:
src/main/java/eu/siacs/conversations/Config.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to 'docs/XEPs.md')
| -rw-r--r-- | docs/XEPs.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/XEPs.md b/docs/XEPs.md index 0dd6a1d7..35c7de45 100644 --- a/docs/XEPs.md +++ b/docs/XEPs.md @@ -3,7 +3,6 @@ * XEP-0045: Multi-User Chat * XEP-0048: Bookmarks * XEP-0115: Entity Capabilities -* XEP-0138: Stream Compression * XEP-0163: Personal Eventing Protocol (avatars and nicks) * XEP-0166: Jingle (only used for file transfer) * XEP-0184: Message Delivery Receipts (reply only) @@ -14,5 +13,7 @@ * XEP-0260: Jingle SOCKS5 Bytestreams Transport Method * XEP-0261: Jingle In-Band Bytestreams Transport Method * XEP-0280: Message Carbons +* XEP-0313: Message Archive Management * XEP-0333: Chat Markers * XEP-0352: Client State Indication +* XEP-0191: Blocking command |