Mercurial > prosody-modules
diff mod_default_bookmarks/mod_default_bookmarks.lua @ 878:6b7a2d1a1879
Merging from upstream
| author | Rob Hoelz <rob@hoelz.ro> |
|---|---|
| date | Mon, 10 Dec 2012 22:37:41 +0100 |
| parents | 597c872d691e |
| children | 853a382c9bd6 |
| author | Rob Hoelz <rob@hoelz.ro> |
|---|---|
| date | Mon, 10 Dec 2012 22:37:41 +0100 |
| parents | 597c872d691e |
| children | 853a382c9bd6 |