diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 10:33:45 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 10:33:45 -0500 |
| commit | 16aeaed7bda590268c621216a42818ec64c1f37b (patch) | |
| tree | 5aaae3387ef3b13a5edc8b1d9b5bf8a634f24b9e /phpBB/includes | |
| parent | a7edbf9258253dd694857af80273f6cddfe91274 (diff) | |
| parent | f4b7cbd9766fff3e4232c5514da18c8fc3ff102b (diff) | |
| download | forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar.gz forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar.bz2 forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar.xz forums-16aeaed7bda590268c621216a42818ec64c1f37b.zip | |
Merge remote-tracking branch 'remotes/bantu/ticket/11662' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11662:
[ticket/11662] Typos: occured -> occurred
Diffstat (limited to 'phpBB/includes')
| -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 16dce16a72..2054124a4e 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -250,7 +250,7 @@ class jabber return true; } - // Apparently an error occured... + // Apparently an error occurred... $this->add_to_log('Error: open_socket() - ' . $errorstr); return false; } |