summaryrefslogtreecommitdiff
path: root/HISTORY
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-09-22 15:41:03 -0400
committerVictor Shyba <victor1984@riseup.net>2016-11-18 15:55:52 -0300
commit9d8f781aead7e15ae7dab53e7dd33f8e7ce1780c (patch)
tree6dda2a19369fc3e01c7800aeeab5cbd6f2a01e9c /HISTORY
parent624e05d56f6e1414a563bd146e468f08cf1be1ec (diff)
[bug] fix bad merge in imports block
Diffstat (limited to 'HISTORY')
0 files changed, 0 insertions, 0 deletions