summaryrefslogtreecommitdiffhomepage
path: root/LICENSE
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-01-19 14:47:36 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-01-19 14:47:36 -0800
commit670e0fa7b9a80624cca5432720f8ff4ff9b3ef19 (patch)
treed2965099d3c7d023cbca2be107073a73b53a7584 /LICENSE
parentdf43fe9911ae414fef4112763446088ea88918bc (diff)
parent8d1fb10d58b4e80ce225bacb634f4544df8aef48 (diff)
Merge branch '1.15' into 1.16
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions