Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.py
This commit is contained in:
Anthony Sottile 2014-03-13 14:12:13 -07:00
commit f5308b0a57
6 changed files with 80 additions and 9 deletions

View file

@ -5,6 +5,11 @@ setup(
name='pre_commit',
version='0.0.0',
packages=find_packages('.', exclude=('tests*', 'testing*')),
package_data={
'pre_commit': [
'resources/pre-commit.sh'
]
},
install_requires=[
'argparse',
'jsonschema',