diff options
| author | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2018-03-22 07:26:59 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2018-03-22 07:26:59 +0100 |
| commit | 9da10f705434d2a18d1ac3670f16d9b10e77f10c (patch) | |
| tree | 5fb118d3fa2a2193faf3758898ee7fe2b6abb549 /AUTHORS | |
| parent | 12af0f6afae11029a608e33b98047aea4e82da7d (diff) | |
| parent | 52052c161e3230d27658d819be68abd4597aa6eb (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,2 +1,2 @@ Weijia Song <songweijia@gmail.com> -Sebastian Pipping <webmaster@hartwork.org> +Sebastian Pipping <sebastian@pipping.org> |