diff options
author | Kim Alvefur <zash@zash.se> | 2016-12-15 13:24:53 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-12-15 13:24:53 +0100 |
commit | 4ce8f255107391bc040fde22b153cfc0049fb3f9 (patch) | |
tree | 799d47e674fd2b55dfc2e58692cf95b21f96a611 /Makefile | |
parent | 91d5ac9714bfd90120cbb3ce3bf1f378be0dd75c (diff) | |
parent | 0d486d4e0b3617e35e288cd524ceb09515c0c51d (diff) | |
download | prosody-4ce8f255107391bc040fde22b153cfc0049fb3f9.tar.gz prosody-4ce8f255107391bc040fde22b153cfc0049fb3f9.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions