Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10 -> trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 04 Apr 2018 18:42:32 +0100
changeset 8712 3521ff896831
parent 8710 fd39c44c0113 (current diff)
parent 8711 c53e9e27acc6 (diff)
child 8713 ed3dcbc5336f
Merge 0.10 -> trunk
CHANGES file | annotate | diff | comparison | revisions 
--- a/CHANGES	Wed Apr 04 18:42:05 2018 +0100
+++ b/CHANGES	Wed Apr 04 18:42:32 2018 +0100
@@ -15,7 +15,7 @@
 -   Busted for tests
 
 0.10.0
-=====================
+======
 
 **2017-10-02**
 
@@ -39,4 +39,3 @@
 
 -   mod\_privacy (XEP-0016)
 -   mod\_compression (XEP-0138)
-
prosody