diff options
author | Jonathan White <jwhite.uscg@gmail.com> | 2018-12-19 06:28:56 +0300 |
---|---|---|
committer | Jonathan White <jwhite.uscg@gmail.com> | 2018-12-19 06:28:56 +0300 |
commit | 9e2be34897d4a4be7339df2bc0997b312ee7c567 (patch) | |
tree | 180cf63a8d3113555b9f2f6f2b5efa358aff32de /README.md | |
parent | 66a36b3af11b597da3ae2bb867244443a5b71199 (diff) | |
parent | a070f1bce7efcc5ce89aea533b181b0fa8c6dea0 (diff) |
Merge branch 'develop'
Conflicts:
CMakeLists.txt
cmake/CLangFormat.cmake
snapcraft.yaml
src/CMakeLists.txt
src/core/Database.cpp
src/core/Database.h
src/core/Tools.cpp
src/crypto/CryptoHash.h
src/crypto/ssh/ASN1Key.h
src/crypto/ssh/OpenSSHKey.cpp
src/format/Kdbx4Reader.cpp
src/gui/DatabaseTabWidget.cpp
src/gui/DatabaseTabWidget.h
src/gui/DatabaseWidget.cpp
src/gui/DatabaseWidget.h
src/gui/DetailsWidget.cpp
src/gui/DetailsWidget.ui
src/gui/EditWidgetProperties.cpp
src/gui/EntryPreviewWidget.cpp
src/gui/EntryPreviewWidget.ui
src/gui/FileDialog.cpp
src/gui/dbsettings/DatabaseSettingsDialog.cpp
src/gui/dbsettings/DatabaseSettingsDialog.h
src/gui/group/EditGroupWidget.cpp
src/gui/group/EditGroupWidget.h
src/sshagent/ASN1Key.h
src/sshagent/OpenSSHKey.cpp
src/sshagent/SSHAgent.cpp
tests/CMakeLists.txt
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ # <img src="https://keepassxc.org/logo.png" width="40" height="40"/> KeePassXC -[![TeamCity Build Status](https://ci.keepassxc.org/app/rest/builds/buildType:\(id:KeepassXC_TeamCityCi\)/statusIcon?guest=1)](https://ci.keepassxc.org/viewType.html?buildTypeId=KeepassXC_TeamCityCi&guest=1) [![Build status](https://ci.appveyor.com/api/projects/status/qmcar8rnqjh4oxof?svg=true)](https://ci.appveyor.com/project/droidmonkey/keepassxc) [![codecov](https://codecov.io/gh/keepassxreboot/keepassxc/branch/develop/graph/badge.svg)](https://codecov.io/gh/keepassxreboot/keepassxc) +[![TeamCity Build Status](https://ci.keepassxc.org/app/rest/builds/buildType:\(project:KeepassXC\)/statusIcon)](https://ci.keepassxc.org/?guest=1) [![codecov](https://codecov.io/gh/keepassxreboot/keepassxc/branch/develop/graph/badge.svg)](https://codecov.io/gh/keepassxreboot/keepassxc) ## Note |