Merge dev fix conflicts

Browse source

...

This commit is contained in:

shpuld 2019-01-20 15:52:35 +02:00

parent 485a061287 7651290e2b

commit 8761e039d0

17 changed files with 1987 additions and 628 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

static/logo.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.4 KiB After Width:  |  Height:  |  Size: 1.3 KiB