Merge branch 'develop' into feature/36

Browse source

...

This commit is contained in:

Simon Brooke 2017-03-30 07:03:24 +01:00

parent 2863badef7 7d4bf2a2c2

commit bc34ca16ff

5 changed files with 27 additions and 7 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/public/img/map-pins/unknown-pin.png Normal file

View file

Binary file not shown.

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

BIN

resources/public/img/map-pins/unknown-pin.xcf Normal file

View file

Binary file not shown.