Merge branch 'master' into develop

Browse Source

...

This commit is contained in:

Taylor Otwell

2017-07-11 13:26:38 -05:00

parent 8999e8745e 098b8a4883

commit d0ce75926f

12 changed files with 66 additions and 38 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

8

public/css/app.css vendored

File diff suppressed because one or more lines are too long

33

public/js/app.js vendored

File diff suppressed because one or more lines are too long