Merge remote-tracking branch 'origin/master' into 1629-change-settings-storage-mechanism

Browse source

...

This commit is contained in:

Karl Erik Õunapuu 2020-08-18 11:37:15 +03:00

parent 1732d6551a 1c8f04c099

commit 2330e8eab1

24 changed files with 443 additions and 31 deletions

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

Download patch file Download diff file Expand all files Collapse all files

BIN

test/fixtures/files/keystore.jks vendored

View file

Binary file not shown.

BIN

test/fixtures/files/keystore.p12 vendored Normal file

View file

Binary file not shown.