Merge remote-tracking branch 'remotes/origin/next' into release_v1.3

2021-02-10 21:00:09 +01:00
parent bc6941d30c cb51e9f422
commit b615fe449e
58 changed files with 4340 additions and 3913 deletions
@@ -131,7 +131,6 @@ SERVER_OBJS= \
 	tools-standalone.o \
 	wizard-standalone.o
 MASTER_OBJS= \
-	crypto-standalone.o \
 	stream-standalone.o \
 	command-standalone.o \
 	master-standalone.o