aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-12-10 16:27:10 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-12-10 16:27:10 -0500
commitf2dab8943a5abb2622092250fdd9700e618190c4 (patch)
tree7fdbfbe03f5ab8b48979c4a0a4f70220bb79dc46 /docs
parente4b8b45ae473b93dbdd0f2629e3233e5bcad92b5 (diff)
parent869cfd9ec4c212ca36c2d2227d0ecf61aa751494 (diff)
downloadcryptography-f2dab8943a5abb2622092250fdd9700e618190c4.tar.gz
cryptography-f2dab8943a5abb2622092250fdd9700e618190c4.tar.bz2
cryptography-f2dab8943a5abb2622092250fdd9700e618190c4.zip
Merge pull request #2520 from reaperhulk/port-changelog
port 1.1.2 changelog to master
Diffstat (limited to 'docs')
-rw-r--r--docs/spelling_wordlist.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index dc8bcd0b..6def7959 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -56,6 +56,7 @@ preprocessors
pseudorandom
pyOpenSSL
relicensed
+runtime
Schneier
scrypt
Serializers