summaryrefslogtreecommitdiffhomepage
path: root/LICENSE
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-04-14 18:54:32 -0400
committerJeff Forcier <jeff@bitprophet.org>2014-04-14 18:54:32 -0400
commite05276b6ab28cb4624d07e2ec8f4f698edb4b27e (patch)
tree20bd6ae851f23abe31feeb36987f28c03dd1f118 /LICENSE
parentd02ae566014c6d79f61f7538c979d6560c1de629 (diff)
parent6dee34648ed7d910464c7f2bbc27f361c9fe6d71 (diff)
Merge branch '1.13'
Conflicts: sites/www/changelog.rst
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions