diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-28 03:53:13 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-28 03:53:13 +0100 |
| commit | ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a (patch) | |
| tree | f24483d86a18d3d11e14457409f02055a88a2af1 /pkgs/development/python-modules/httpserver | |
| parent | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (diff) | |
openssl: fix merge conflict between b6dabe3 and 6e7ca92
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions