diff options
| author | Kim Alvefur <zash@zash.se> | 2013-11-24 14:24:53 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-11-24 14:24:53 +0100 |
| commit | 6c41d496a264e33b469c73f92253d0e158a496eb (patch) | |
| tree | a2c0c940737f448a1d9baa03f8d6ee7c8712de84 /core/configmanager.lua | |
| parent | b97004e26e179b6a75ddd99fe2b817ce12badfe9 (diff) | |
| parent | 0aba6244bcd6d0b56be65229719fbd85a20e74b6 (diff) | |
| download | prosody-6c41d496a264e33b469c73f92253d0e158a496eb.tar.gz prosody-6c41d496a264e33b469c73f92253d0e158a496eb.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions