diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-08-26 09:35:42 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-08-26 09:35:42 +0200 |
| commit | ea2de30794af69d5936dcfae033f80ca94299095 (patch) | |
| tree | 9f9dde23a2aa1cdc8b292085d1617b06c1519a97 /server.h | |
| parent | 921faf9c3970b09a2cc2cd5aae6fd4eb4b6a4442 (diff) | |
| parent | a907e8c65f67936cfc0504e796d7f266f62cec5e (diff) | |
Merge remote-tracking branch 'origin/debian'
The future "upstream" is APT itself, which leaves the packaging as the
new master branch of this repository. The merge just ensures we keep all
of the history straight rather than renaming branches.
Diffstat (limited to 'server.h')
0 files changed, 0 insertions, 0 deletions