diff options
author | Kali Kaneko (leap communications) <kali@leap.se> | 2017-02-23 01:37:47 +0100 |
---|---|---|
committer | Kali Kaneko (leap communications) <kali@leap.se> | 2017-02-23 01:37:47 +0100 |
commit | 6b3ea883a62d40f8e2d68ce95bbefa2ac64b95de (patch) | |
tree | a16530fa64b5abaf92708c554fdbefa01c282586 /docs/changelog.rst | |
parent | a053c81939792582636a131c7640cf954b7638fd (diff) |
[bug] fix bad merge
Diffstat (limited to 'docs/changelog.rst')
0 files changed, 0 insertions, 0 deletions