diff options
| author | Frank Bergkemper <frank.bergkemper@bareos.com> | 2018-01-15 13:27:20 +0300 |
|---|---|---|
| committer | Frank Bergkemper <frank.bergkemper@bareos.com> | 2018-01-15 13:27:20 +0300 |
| commit | 94cb3b06d52bd6a0d449e37d338a97d64c8d93d4 (patch) | |
| tree | e5238b1fcc51f78ba3c27420dff7a1deb36fd8c9 | |
| parent | edd7bad4470640a623f3563c8cc01c37a6a04481 (diff) | |
| parent | f51858af09bb88966af85633d86ff4abbdcafecf (diff) | |
Merge branch 'bareos-16.2' into bareos-17.2
Resolved Conflicts:
AUTHORS
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -17,3 +17,4 @@ Pavol Vrba Tobias Ehrig Pavel Borecki Sam Verstraete +Aron Schüler |