diff options
| author | intrigeri <intrigeri@boum.org> | 2016-06-29 18:47:14 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2016-06-29 18:47:14 +0000 |
| commit | 92e7d506c0d570ce0d6eabc9492a785c94156cf2 (patch) | |
| tree | f502c85219a8c4428d41b38396eaade5667e2141 /LICENSE | |
| parent | 195ed5d31bf5dabd5efe4460127002351499eac2 (diff) | |
| parent | bc73809d7b33541b50ba9f38cb3bf1dd2237b98f (diff) | |
Merge remote-tracking branch 'shared/master' into feature/8-make_dist-upgrade_timeout_configurable
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions