summaryrefslogtreecommitdiffhomepage
path: root/README.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-06-12 11:24:13 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-06-12 11:24:13 -0700
commit3a13b43a0d15b9af10a8106574d91397d18faa07 (patch)
tree668bd32c25c7f98fb37e702f68f9e892db638ebd /README.rst
parentb4216350a0ef1bc7118f6eebe158a155c96a41fd (diff)
parent33981bd838a5c396fe561ce98fe1ea7d5e27b316 (diff)
Merge branch '1.17' into 2.0
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions