tree df3aed79256417de63fb0dc91592edd32803722e
parent 4af8709e4f39b82cb801d5497e760f00b130397d
parent b7d4a8d9c0431bf7d8de02feeeac0cdb64ae83f9
author Paladox <thomasmulhall410@yahoo.com> 1553016478 +0000
committer Paladox <thomasmulhall410@yahoo.com> 1553016502 +0000

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix hiding http credentials if using a different auth type.

Change-Id: I6b070346dc281de024f4dc18fecfe566c073539f