summaryrefslogtreecommitdiff
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-09-22 15:41:03 -0400
committerdrebs <drebs@leap.se>2016-12-12 09:11:59 -0200
commit7d6373566120d1211b60e4a926c6bc9a78015637 (patch)
treed12592170b2666a571a1d481a1f0fe8ba62ddedf /CHANGELOG.rst
parent69958161af00958b1d92ab6153a591aa89199e35 (diff)
[bug] fix bad merge in imports block
Diffstat (limited to 'CHANGELOG.rst')
0 files changed, 0 insertions, 0 deletions