summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorMichaël Ball <michael.ball@gmail.com>2017-11-18 19:03:06 +0000
committerMichaël Ball <michael.ball@gmail.com>2017-11-18 19:03:06 +0000
commitfb7a21523bc95d6d0872aaefa178156ae8965eba (patch)
tree3ae19eeae976fb9c1d2e2bdfc2b6b03a4a60e443 /LICENSE
parentb11a7291998680212e1bac2fdb689db68e440ba4 (diff)
Fix merge mess-up
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions