Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	README.md

...

This commit is contained in:

Channel Cat 2016-10-01 19:32:36 -07:00

parent 8cc028764d 6680266c86

commit acb67ea66c

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