Merge branch 'master' into pre/1.12

Browse Source

...

This commit is contained in:

Zach Brown

2017-05-17 17:52:45 -05:00

parent d67b067983 0377b7b862

commit 43a4d24ea0

2 changed files with 28 additions and 1 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

2

work/Paperclip

Submodule work/Paperclip updated: 13d77aaa27...6dcb3241ca