Mercurial > prosody-modules
diff mod_pubsub_feed/mod_pubsub_feed.lua @ 522:0c756f62758d
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 06 Jan 2012 12:13:14 +0100 |
| parents | db5702bb9e41 |
| children | 0d3174d5a1cc |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 06 Jan 2012 12:13:14 +0100 |
| parents | db5702bb9e41 |
| children | 0d3174d5a1cc |