diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-04-20 16:55:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-20 16:55:15 +0200 |
| commit | 38933324a69d7fec9bd76056950ff3feb9dd131c (patch) | |
| tree | 728ae2a2bb34d969593e1ae1cc7f7bb3ea4b52a7 /pkgs/development/python-modules/httpserver | |
| parent | d15f26ec69e3e76f3c145b92a35b315532e0cd57 (diff) | |
| parent | be7ce1b0e9809da1f41571a63584fb8b9e346295 (diff) | |
Merge pull request #25059 from vcunat/p/kdiff3-git-mergetool
kdiff3: fix with git mergetool
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions