diff options
author | Ben Gamari <ben@smart-cactus.org> | 2016-05-14 10:15:45 +0200 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2016-05-14 10:15:45 +0200 |
commit | c277db2271e22e3b8fa1afeaf42ffc6988a48720 (patch) | |
tree | c498625fcf269851ee409a28abb006ac6673f384 /LICENSE | |
parent | 261342e47efc2756c6befd1e3d83c42d5dd082c6 (diff) | |
parent | 26e6b39de3213969d7de7f8bb3d4a849136866d1 (diff) |
Merge remote-tracking branch 'origin/master' into ghc-head
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions