]> git.sesse.net Git - casparcg/commit
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)
commitcc58e432aeb71030449587d23dbb72c6b0ec23e5
treec4e6749327f41ad3610469d00c4aac102cddd08f
parentb8aa3dc64caaf2a4497f114936af5e5bd43dfa34
parent5a3f6315ddd74ef13c69069498dcfe034f4ca80a
Merge branch '2.1.0' of https://github.com/aruanoc/Server into 2.1.0