aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-05-20 08:25:42 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-05-20 08:25:42 +0200
commit70ebe35ffede6d2ce49104dbb815be3f1a396d1f (patch)
tree413780e43eb04e721aa0d3205d766a15c9d78ecd /LICENSE
parent201bc158bd9fa77c1ffcea53758280bd830e5710 (diff)
parent8064832dcaf9098ed7748fbdf3e21f3f6734cd28 (diff)
Merge branch 'master' into development
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions