Mercurial > prosody-modules
diff mod_default_bookmarks/mod_default_bookmarks.lua @ 1322:bf6796061037
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 20:17:13 +0100 |
| parents | 597c872d691e |
| children | 853a382c9bd6 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 20:17:13 +0100 |
| parents | 597c872d691e |
| children | 853a382c9bd6 |