Software / code / prosody
Comparison
plugins/adhoc/adhoc.lib.lua @ 6150:5b59798c979a
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 23 Apr 2014 00:23:46 +0200 |
| parent | 5758:ebc074918173 |
| child | 6302:76699a0ae4c4 |
comparison
equal
deleted
inserted
replaced
| 6145:69bc9dfcbd89 | 6150:5b59798c979a |
|---|