diff options
| author | Link Mauve <linkmauve@linkmauve.fr> | 2019-08-01 22:30:58 +0200 |
|---|---|---|
| committer | Link Mauve <linkmauve@linkmauve.fr> | 2019-08-01 22:30:58 +0200 |
| commit | bec6f7c8f330145fb472ad917f3cb1e78697f2e0 (patch) | |
| tree | c294b13188a65c2a5d81093b4f14e4696f8859a5 /CONTRIBUTING.rst | |
| parent | d57fbb57a227a083370854259d15154a950e0c86 (diff) | |
| parent | 027ce2434d7fd3cf4a286dd373cb761c0d114c66 (diff) | |
| download | slixmpp-bec6f7c8f330145fb472ad917f3cb1e78697f2e0.tar.gz slixmpp-bec6f7c8f330145fb472ad917f3cb1e78697f2e0.tar.bz2 slixmpp-bec6f7c8f330145fb472ad917f3cb1e78697f2e0.tar.xz slixmpp-bec6f7c8f330145fb472ad917f3cb1e78697f2e0.zip | |
Merge branch 'mam' into 'master'
Removed 'block' from set_preferences as it was giving a TypeError while sending the staza.
See merge request poezio/slixmpp!20
Diffstat (limited to 'CONTRIBUTING.rst')
0 files changed, 0 insertions, 0 deletions