diff options
| author | Patrick Simianer <p@simianer.de> | 2014-07-04 13:32:22 +0200 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2014-07-04 13:32:22 +0200 |
| commit | 38226f8be5b54ccd79e2456216f7486a9249780d (patch) | |
| tree | 39a8edc7bc34d665b65478a0bda1eeadf0475086 /.travis.yml | |
| parent | 9351b82d65713cc076c8097427f21f1c7ad4f5d2 (diff) | |
| parent | f3255478edc9b04fd13d4e74a2fbf37aeb981202 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions