Merge master into reactions

Browse source

...

This commit is contained in:

Joseph Donofry 2020-05-14 20:53:01 -04:00

parent ff7468e6d5 eb4b02e8b9

commit 6d2789f4d5

No known key found for this signature in database

GPG key ID: E8A1D78EF044B0CB

38 changed files with 6320 additions and 467 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

resources/icons/ui/unlock.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 385 B

BIN

resources/icons/ui/unlock@2x.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 741 B