Merge remote-tracking branch 'origin/performance_test' into performance_test

Browse source

Conflicts:
	pre_commit/languages/python.py

...

This commit is contained in:

Anthony Sottile 2014-03-14 00:31:51 -07:00

parent 43767511e2 6b62ec47e8

commit 14d0d30b07

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