aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-04-04 20:44:39 +0200
committerChristian S <christian@pix-art.de>2016-04-04 20:44:39 +0200
commit89ca103b9f2d89c0c06f68747f2c6f2a8a4c0c91 (patch)
tree3764ba105681557736d7e95c3c8d6ac240952784 /LICENSE
parent3e31db1746e90f460686b0a3fd55ffaa516e2bca (diff)
parent0385e3a8d62ebe68a8c40a75ea95d3726d3839f3 (diff)
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions