summaryrefslogtreecommitdiffhomepage
path: root/README.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-11-07 12:44:00 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-11-07 12:44:00 -0800
commit842fa50b3634f656db2dce8d6a423714e4ce896d (patch)
tree8a306d84cb969a2ba9f5ca37e2bb962aa349cbcc /README.rst
parent6334ff07f55cd84a12ae19e11f07f80d4e11f940 (diff)
parent5169475719190834a750596e00cae365e06f7387 (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions