Merge branch 'master' into working-version

Browse Source

...

This commit is contained in:

Beatrice Olivera

2018-08-31 21:44:53 +01:00

committed by GitHub

parent 8c833e47d9 e2a520b55c

commit ed238f3f7e

10 changed files with 40 additions and 203 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

app/assets/images/phone.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 MiB After Width:  |  Height:  |  Size: 101 KiB