Mercurial > prosody-modules
diff mod_remote_roster/mod_remote_roster.lua @ 1645:9a862059bd97
Merge
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 02 Apr 2015 18:51:13 -0700 |
| parents | 295ae44b8a01 |
| children | ad6e9b0fd15b |
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 02 Apr 2015 18:51:13 -0700 |
| parents | 295ae44b8a01 |
| children | ad6e9b0fd15b |