diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-19 19:00:46 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-19 19:00:46 +0200 |
| commit | b42b0643f07546e85488e7384b960fcdd961db7e (patch) | |
| tree | 5dc4e5efd72ad25de87e42f7b51f7cd7a209a515 /COPYING | |
| parent | e81b3519746ee2933e643a235c18a2246b56dbf2 (diff) | |
| parent | 4c8e24cd0aa6c4ff6d84f8b9340d146220752cf7 (diff) | |
| download | prosody-b42b0643f07546e85488e7384b960fcdd961db7e.tar.gz prosody-b42b0643f07546e85488e7384b960fcdd961db7e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions