1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00

Merge branch 'master' into roomconfig

This commit is contained in:
James Booth 2014-09-07 22:36:05 +01:00
commit aeca03d348

View File

@ -608,6 +608,6 @@ handle_ping_error_result(const char * const from, const char * const error)
if (error == NULL) { if (error == NULL) {
cons_show_error("Error returned from pinging %s.", from); cons_show_error("Error returned from pinging %s.", from);
} else { } else {
cons_show_error("Error returned form pinging %s: %s.", from, error); cons_show_error("Error returned from pinging %s: %s.", from, error);
} }
} }