commit f846c5d697300067377de1195fe7f97ec090f672 Merge: 003c3c8 f01a6fe Author: juga0 juga@riseup.net Date: Wed Feb 5 14:55:45 2020 +0000

Merge branch 'maint-1.1'

sbws/lib/relaylist.py | 40 ++++++++++++++++++++++++++++++++++------ sbws/util/timestamp.py | 23 ++++++++++++++++++++++- 2 files changed, 56 insertions(+), 7 deletions(-)