summaryrefslogtreecommitdiffhomepage
path: root/setup.cfg
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-11-05 15:15:53 -0800
committerJeff Forcier <jeff@bitprophet.org>2015-11-05 15:15:53 -0800
commit9886b386b1f5f026c5d3529af8dd709d85be289e (patch)
tree64861d9740bdcd20bb0d921c612cba19aa38e1ac /setup.cfg
parent6e443b75c8d3b0c6399ce2fbcf8a2cdb251dcaad (diff)
parenta2076f689d5ac5afee7f84528f7bb03f4a1aded4 (diff)
Merge branch '1.14' into 1.15
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions