Resolved merge conflict

Browse Source

...

This commit is contained in:

Vasily

2018-12-25 22:00:03 +01:00

parent 4438f4cd28 f085abedc9

commit f9784ec62c

10 changed files with 618 additions and 73 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

docs/screenshots/AudioPage.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 63 KiB After Width:  |  Height:  |  Size: 107 KiB

docs/screenshots/PlayspacePage.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 88 KiB After Width:  |  Height:  |  Size: 91 KiB