aboutsummaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-05-27 09:32:44 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-05-27 09:33:01 +0200
commit0bcf04f0467cf27a9cf87ad68342c001ba07ad69 (patch)
treeef646a47e0cb2b64c77504ce0338e79e705ba347 /qa
parentdf992b9c1807d4290c40d3074dfc63a0eadc4974 (diff)
parent8c35b6f3be218101630101806300cfd75be23f58 (diff)
Merge pull request #6153
8c35b6f Parameter interaction: disable upnp if -proxy set (Wladimir J. van der Laan)
Diffstat (limited to 'qa')
0 files changed, 0 insertions, 0 deletions