diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-08 14:10:31 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-08 14:10:31 -0800 |
| commit | 388c11a972695ba8c3a5f1a4c68345ce08a3219e (patch) | |
| tree | ab35e32a97383065b6b93c22e3a120fbe075c658 /dev-requirements.txt | |
| parent | 13ec4799e47b5180d397e2f5028005c58e8e93be (diff) | |
| parent | a5ba6e5493f6f523de90ea5ecf376c011f8e48ff (diff) | |
| download | cryptography-388c11a972695ba8c3a5f1a4c68345ce08a3219e.tar.gz cryptography-388c11a972695ba8c3a5f1a4c68345ce08a3219e.tar.bz2 cryptography-388c11a972695ba8c3a5f1a4c68345ce08a3219e.zip | |
Merge branch 'master' into rtd-theme
Conflicts:
dev-requirements.txt
Diffstat (limited to 'dev-requirements.txt')
| -rw-r--r-- | dev-requirements.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index 8e9a4ab0..cd975d5c 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,3 +5,4 @@ coverage sphinx tox sphinx_rtd_theme +-e . |