diff options
author | Patrick Simianer <p@simianer.de> | 2014-06-27 15:47:54 +0200 |
---|---|---|
committer | Patrick Simianer <p@simianer.de> | 2014-06-27 15:47:54 +0200 |
commit | 48027e9eeebda4f8506c00ff259fb3426149f85b (patch) | |
tree | 6fb93f2dace75a3e10a64e008e2f1387ec868164 /.travis.yml | |
parent | 001804edef29549dc49b2adf6bab88cd7f24760a (diff) | |
parent | 284c2a9009d60e787566eec1cdebfdde248aa0c5 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions