summaryrefslogtreecommitdiffhomepage
path: root/README.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-10-18 11:56:45 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-10-18 11:56:45 -0700
commit71608fd6615ab88ab9ca5b3a8ad1e89a342afd58 (patch)
tree264d506aff706e7a8e2b1233d894606c582e08ba /README.rst
parent1845168ecf034507cc00ea51837ea93cc440027e (diff)
parent05fcd2e8f56c7b33693283c74909515a461ef650 (diff)
Merge branch '2.1' into 2.2
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions