diff options
| author | Philip Nicolcev <frugen@gmail.com> | 2016-04-30 15:46:28 -0400 |
|---|---|---|
| committer | Philip Nicolcev <frugen@gmail.com> | 2016-04-30 15:46:28 -0400 |
| commit | bb824fabf6cb01d1a2581f4d93926986b6f3bb4c (patch) | |
| tree | 363d133610eda6ef060a4d2d5bb31a65dadf3034 /chat/lib/config.php | |
| parent | 3716716f1bc45ab5962ab53393e8296ea6a13bda (diff) | |
| parent | 6a4c92984fbe42e4633a6a65792847973f7d36da (diff) | |
| download | AJAX-Chat-origin/smf.zip AJAX-Chat-origin/smf.tar.gz AJAX-Chat-origin/smf.tar.bz2 | |
Merge remote-tracking branch 'origin' into smforigin/smf
Conflicts:
chat/lib/custom.php
Diffstat (limited to 'chat/lib/config.php')
| -rw-r--r-- | chat/lib/config.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chat/lib/config.php b/chat/lib/config.php index 00271ae..3057adc 100644 --- a/chat/lib/config.php +++ b/chat/lib/config.php @@ -208,4 +208,3 @@ $config['socketServerIP'] = '127.0.0.1'; $config['socketServerPort'] = 1935; // This ID can be used to distinguish between different chat installations using the same socket server: $config['socketServerChatID'] = 0; -?> |