Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 6145:69bc9dfcbd89
Merge daurnimator->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 21 Apr 2014 17:42:44 +0100 |
| parents | 2f911644f527 |
| children | ac4f8770d9aa |
comparison
equal
deleted
inserted
replaced
| 6090:61403eb023bf | 6145:69bc9dfcbd89 |
|---|