add diary branch merged #44

Closed ghost closed 6 years ago