diff options
| author | Toni <jeder@mail1a.de> | 2016-08-19 09:49:56 +0200 |
|---|---|---|
| committer | Toni <jeder@mail1a.de> | 2016-08-19 09:49:56 +0200 |
| commit | 225c73ed30b97229bcb88182b5153c27082886f9 (patch) | |
| tree | 3aa08f903fd3dd886656efccf96020083c8c1f9f /.travis.yml | |
| parent | fe906538861c5ee30a75d6f955e611dd38d93977 (diff) | |
| parent | 2c59f71090f5053fee389012871bff801c2b0a2e (diff) | |
Merge remote-tracking branch 'origin/master' into amj60
merge with upstream
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions