Merge branch 'develop' into feature/bg2

Browse Source

...

This commit is contained in:

Sander Roosendaal

2017-04-13 15:02:28 +02:00

parent 065f4e6828 6531eb37f8

commit da0d9f3d0b

22 changed files with 469 additions and 111 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/img/close.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 190 B