Mercurial > prosody-hg
diff core/usermanager.lua @ 6605:03a43bf3ecd2
Merge with merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 27 Mar 2015 00:28:16 +0100 |
| parents | 47c2f71d8314 |
| children | 8495734da243 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 27 Mar 2015 00:28:16 +0100 |
| parents | 47c2f71d8314 |
| children | 8495734da243 |