diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /docs | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.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
src/main/res/values-de/strings.xml
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/XEPs.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/XEPs.md b/docs/XEPs.md index 35c7de45..c64f1f57 100644 --- a/docs/XEPs.md +++ b/docs/XEPs.md @@ -9,6 +9,7 @@ * XEP-0198: Stream Management * XEP-0234: Jingle File Transfer * XEP-0237: Roster Versioning +* XEP-0245: The /me Command * XEP-0249: Direct MUC Invitations (receiving only) * XEP-0260: Jingle SOCKS5 Bytestreams Transport Method * XEP-0261: Jingle In-Band Bytestreams Transport Method |