summaryrefslogtreecommitdiffhomepage
path: root/README.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-11-07 13:47:11 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-11-07 13:47:11 -0800
commit899434caf5d443209831b761baa3e63d04101e43 (patch)
treeec7a6cda2e92ddc8b5fed75bfde05f1b782fa479 /README.rst
parent3e14bdde71094bfc77a289c82db8ccada0d31204 (diff)
parent9d70f8c71f601f928d7e4bf31c4a0b5c159a205a (diff)
Merge branch '2.1' into 2.2
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions