Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	{{ cookiecutter.repo_name }}/README.md

...

This commit is contained in:

Peter Bull

2016-03-19 16:50:05 -04:00

parent 74d36bd24c f5ebe3f89b

commit 296e6be1fc

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

Diff Content Not Available