diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-03-15 13:01:57 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-03-15 13:01:57 -0400 |
| commit | 5861cde4cc1341840bc11a167335669e0154fae4 (patch) | |
| tree | 734b63f74585ca078608374e2222012d7b74702d /.travis.yml | |
| parent | 0974458816e272efacac62dcf589d60f367826fe (diff) | |
| parent | cfeca480db0116c5c8d95ba1aaa9e5e5e02951ed (diff) | |
Merge branch 'master' into switch-to-cryptography
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions