]> git.sesse.net Git - casparcg/commitdiff
projects / casparcg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8aa3dc 5a3f631)
Merge branch '2.1.0' of https://github.com/aruanoc/Server into 2.1.0
authorAntonio Ruano Cuesta <antonio@fightmetric.com>
Wed, 11 Jan 2017 17:20:36 +0000 (12:20 -0500)
committerAntonio Ruano Cuesta <antonio@fightmetric.com>
Wed, 11 Jan 2017 17:20:36 +0000 (12:20 -0500)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.