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