Merge branch 'obsd-master'

2025-09-02 05:21:10 +00:00 · 2017-04-21 16:01:18 +01:00
parent 93062ad099 c799425069
commit 4612419c14
19 changed files with 89 additions and 66 deletions
--- a/server.c
+++ b/server.c
@ -175,8 +175,6 @@ server_start(struct event_base *base, int lockfd, char *lockfile)

 	start_cfg();

-	status_prompt_load_history();
-
 	server_add_accept(0);

 	proc_loop(server_proc, server_loop);