Merge remote-tracking branch 'origin/main' into branch

Browse Source

# Conflicts:
#	PasswordManager/CMakeLists.txt
#	PasswordManager/adddialog.cpp
#	PasswordManager/cryptographer.cpp
#	PasswordManager/cryptographer.h
#	PasswordManager/del.cpp
#	PasswordManager/del.h
#	PasswordManager/del.ui
#	PasswordManager/hello.cpp
#	PasswordManager/hello.h
#	PasswordManager/hello.ui
#	PasswordManager/mainwindow.cpp
#	PasswordManager/mainwindow.h
#	PasswordManager/mainwindow.ui

Return to main branch

...

This commit is contained in:

Daniil Neizvestniy 2022-01-06 17:23:48 +03:00

parent ee97b78e9e 8e9f01a0a3

commit 215029a0bc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available