Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-11-23 00:10:37 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master'

Browse source 
Conflicts:
	INSTALL.md
	release-tool
	src/browser/BrowserOptionDialog.cpp
	src/browser/BrowserService.cpp
	src/browser/BrowserService.h
	src/browser/NativeMessagingBase.h
	src/browser/NativeMessagingHost.h
	src/core/Uuid.cpp
	src/gui/DatabaseTabWidget.cpp
	src/gui/DatabaseWidget.cpp
	src/gui/EditWidget.cpp
	src/gui/MainWindow.cpp
	src/gui/MainWindow.ui
	src/proxy/NativeMessagingHost.h
	src/sshagent/ASN1Key.cpp
This commit is contained in:
Jonathan White 2018-08-24 08:40:41 -04:00
commit ca27fb06d5
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
52 changed files with 5657 additions and 1106 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/Entry.cpp
View file

@ -281,8 +281,7 @@ QString Entry::webUrl() const
QString Entry::displayUrl() const
{
QString url = maskPasswordPlaceholders(m_attributes->value(EntryAttributes::URLKey));
url = resolveMultiplePlaceholders(url);
return resolveUrl(url);
return resolveMultiplePlaceholders(url);
}
QString Entry::username() const