diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-02-27 20:58:39 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-02-27 20:58:39 -0500 |
| commit | 2d350c134658392dfd7ffe55e101ff8a61bd3010 (patch) | |
| tree | ab7dfd059661897dbe48d135d5a89390f6fef918 /sites/www/conf.py | |
| parent | 578ae9dcfdb4b9973f784adb3b67f24b52d79989 (diff) | |
| parent | 74ba0149347bfeb2f83ddd46672a2912aea51f23 (diff) | |
Merge branch 'master' into switch-to-cryptography
Diffstat (limited to 'sites/www/conf.py')
0 files changed, 0 insertions, 0 deletions