aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorLuc Donnet2018-05-28 22:35:38 +0200
committerGitHub2018-05-28 22:35:38 +0200
commit02f3c85cc054219a715bff86d119c6a0d10a7c36 (patch)
tree10b44f152ddaf33e855d4184b84b94c21c55e13c /package.json
parent3de76935e461c2b1302a086817d7d65ec6436b73 (diff)
parenta31065cc0ad7dc49bc3ea0475dbc9a87f8c612db (diff)
downloadchouette-core-02f3c85cc054219a715bff86d119c6a0d10a7c36.tar.bz2
Merge pull request #569 from af83/6622-fix-loops-in-merge
6622 Ensure that the merge operation deals with loops well
Diffstat (limited to 'package.json')
0 files changed, 0 insertions, 0 deletions