merge from cgilite
[confetti] / .gitmodules