diff options
author | mathieui <mathieui@mathieui.net> | 2020-05-28 00:35:48 +0200 |
---|---|---|
committer | mathieui <mathieui@mathieui.net> | 2020-05-28 00:35:48 +0200 |
commit | bb61f0f39dfba205282dab50c0f3a47b26145c74 (patch) | |
tree | 5d55cb9e2ce386273c188f840a3fb6ce713524f7 /examples/markup.py | |
parent | 6f4e9b485f743bc55ab0c2ae08afcdae89451110 (diff) | |
parent | a29ce4b54774de050f352606d06bb111ecff4a65 (diff) | |
download | slixmpp-bb61f0f39dfba205282dab50c0f3a47b26145c74.tar.gz slixmpp-bb61f0f39dfba205282dab50c0f3a47b26145c74.tar.bz2 slixmpp-bb61f0f39dfba205282dab50c0f3a47b26145c74.tar.xz slixmpp-bb61f0f39dfba205282dab50c0f3a47b26145c74.zip |
Merge branch 'xep-0421' into 'master'
New XEP: 0421 Occupant-id
See merge request poezio/slixmpp!55
Diffstat (limited to 'examples/markup.py')
0 files changed, 0 insertions, 0 deletions