diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 10:37:52 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 10:37:52 -0500 |
| commit | 193670d7a9124a3bdd0fa3ae78733d80a26c5cbb (patch) | |
| tree | 476f63d44af5fcc28528eff2f2d746eb8100bdcc /phpBB/includes/functions_jabber.php | |
| parent | b1d3c1bf6990c8105c18eb9db06ebf9c974b0899 (diff) | |
| parent | 16aeaed7bda590268c621216a42818ec64c1f37b (diff) | |
| download | forums-193670d7a9124a3bdd0fa3ae78733d80a26c5cbb.tar forums-193670d7a9124a3bdd0fa3ae78733d80a26c5cbb.tar.gz forums-193670d7a9124a3bdd0fa3ae78733d80a26c5cbb.tar.bz2 forums-193670d7a9124a3bdd0fa3ae78733d80a26c5cbb.tar.xz forums-193670d7a9124a3bdd0fa3ae78733d80a26c5cbb.zip | |
Merge branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
[ticket/11662] Typos: occured -> occurred
Conflicts:
tests/template/template_test.php
Diffstat (limited to 'phpBB/includes/functions_jabber.php')
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index 3d8e403f4b..b260ffad6e 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -249,7 +249,7 @@ class jabber return true; } - // Apparently an error occured... + // Apparently an error occurred... $this->add_to_log('Error: open_socket() - ' . $errorstr); return false; } |