diff options
| author | John Anderson <sontek@gmail.com> | 2015-06-19 21:29:34 -0700 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-06-19 21:29:34 -0700 |
| commit | 8a981aa265dca09f76db2b734cd88d6654672cdf (patch) | |
| tree | 55b034d7065e2e19b057d084cc410c1c978176a9 /.gitignore | |
| parent | 47a9e40976040d60a42a28e5ba8a1b91fe5733a8 (diff) | |
| parent | 5a135c0f72e54f570da69872dc32a2b6c384e2ff (diff) | |
| download | pymemcache-8a981aa265dca09f76db2b734cd88d6654672cdf.tar.gz | |
Merge branch 'master' of github.com:pinterest/pymemcache into switch_to_pytest
Conflicts:
.gitignore
tox.ini
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -35,3 +35,4 @@ pip-log.txt .pypirc coverage.xml \#*\# +docs/_build |