diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-26 16:57:04 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-26 16:57:04 -0800 |
| commit | 16a2ca4d7540e1ef9786be132932a559e26b268e (patch) | |
| tree | 8148c5671e34a9e827cadb3c740d70b29a5cc44c /.travis.yml | |
| parent | a5b3db52cd8883e24dc2addb8897e2fe7af4989c (diff) | |
| parent | bed8f679df11ee93c950022240cdac3f73aeb055 (diff) | |
Merge branch 'travis_node' of github.com:murgatroid99/grpc into travis-c++
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions