[gnunet] 02/03: Merge branch 'master' of git+ssh://git.gnunet.org/gnunet

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

commit ee778d9e8963b4daaae7fbd0eecab7a124c7e1d0
Merge: e97190eb7 ef9817663
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Nov 18 10:10:15 2022 +0100

    Merge branch 'master' of git+ssh://git.gnunet.org/gnunet

 contrib/docker/.dockerignore        |  2 +
 contrib/docker/Dockerfile           | 79 +++++++++++++++++++++++--------------
 contrib/docker/docker-entrypoint.sh | 16 ++------
 contrib/docker/gnunet.conf          | 21 ----------
 4 files changed, 55 insertions(+), 63 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.