Merge branch 'develop' into staging

Browse source

...

This commit is contained in:

Xavier J 2016-07-08 12:04:41 +02:00

parent 6e68fa97b4 49c10fc00e

commit 5bd6fad180

4 changed files with 2 additions and 2445 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

app/assets/images/keywords/faciliter.png

View file

Binary file not shown.

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

BIN

app/assets/images/keywords/profiter.png

View file

Binary file not shown.

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

BIN

app/assets/images/landing_background.jpg

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 771 KiB After Width:  |  Height:  |  Size: 384 KiB

2447

vendor/assets/javascripts/typeahead.bundle.js vendored

View file

File diff suppressed because one or more lines are too long