Manual merge of v1.4.21 into v2

Browse source

...

This commit is contained in:

JonnyWong16 2017-08-02 21:37:59 -07:00

parent 1ac4d43db2 af77e51307

commit 68072d8340

13 changed files with 120 additions and 16 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

data/interfaces/default/images/flattr-badge-large.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

data/interfaces/default/images/gold-rect-paypal-34px.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

data/interfaces/default/images/platforms/plextogether.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.2 KiB