Revision 7af167ee9a8bb3b035cd93a0676058dc551123da

Committed on 08/01/2020 4:41 am by XWB <karelke@gmail.com> [GitHub Diff]

Merge branch '2.x'

Conflicts:
Changelog.md
Twig/CommentExtension.php