Mercurial > prosody-hg
diff plugins/mod_dialback.lua @ 7106:74798480b52e
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 27 Jan 2016 20:32:01 +0000 |
| parents | dd8265ca9327 5c6e78dc1864 |
| children | 1d0862814bfc |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 27 Jan 2016 20:32:01 +0000 |
| parents | dd8265ca9327 5c6e78dc1864 |
| children | 1d0862814bfc |