diff options
| author | Adam Hupp <adam@hupp.org> | 2013-09-27 09:49:24 -0700 |
|---|---|---|
| committer | Adam Hupp <adam@hupp.org> | 2013-09-27 09:49:24 -0700 |
| commit | 2b2f1fba280a2a8a37228417ede3228021da5a68 (patch) | |
| tree | 6fc3c70778f8f176c333b8534f2992a60cdd9bb3 /setup.py | |
| parent | 20e713777b8a005bcb81ae7e29db8735a9dbc054 (diff) | |
| parent | d529597e3d26e89f7f86c39a7959f582fd1b3c9e (diff) | |
| download | python-magic-2b2f1fba280a2a8a37228417ede3228021da5a68.tar.gz | |
Merge branch 'master' of https://github.com/aromanovich/python-magic into aromanovich-master
Conflicts:
test.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions