]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'kdenlive' of git.parisson.com:git/telemeta into kdenlive
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 10 Jul 2019 14:09:16 +0000 (16:09 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 10 Jul 2019 14:09:16 +0000 (16:09 +0200)
Conflicts:
telemeta/util/kdenlive/session.py


Trivial merge