mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-22 07:56:21 +00:00
Merge branch 'master' into openpgp
Conflicts: .travis.yml
This commit is contained in:
@@ -103,7 +103,7 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
|
||||
otr_poll();
|
||||
#endif
|
||||
notify_remind();
|
||||
jabber_process_events();
|
||||
jabber_process_events(10);
|
||||
ui_update();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user