diff options
| author | Philip Nicolcev <frugen@gmail.com> | 2016-04-30 15:41:25 -0400 |
|---|---|---|
| committer | Philip Nicolcev <frugen@gmail.com> | 2016-04-30 15:41:25 -0400 |
| commit | e414b88bf618acb1fa6c7d422669ec67d3f6ac51 (patch) | |
| tree | 79067a7c736f7542fea6bc0a885ca9c9b00ac059 /chat/lib/classes.php | |
| parent | 907581d416b6b84277e16d5c10c8da84567701a6 (diff) | |
| parent | 6a4c92984fbe42e4633a6a65792847973f7d36da (diff) | |
| download | AJAX-Chat-origin/mybb.zip AJAX-Chat-origin/mybb.tar.gz AJAX-Chat-origin/mybb.tar.bz2 | |
Merge remote-tracking branch 'origin' into mybborigin/mybb
Conflicts:
chat/lib/custom.php
Diffstat (limited to 'chat/lib/classes.php')
| -rw-r--r-- | chat/lib/classes.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chat/lib/classes.php b/chat/lib/classes.php index ff1dee2..105aeeb 100644 --- a/chat/lib/classes.php +++ b/chat/lib/classes.php @@ -23,4 +23,3 @@ require(AJAX_CHAT_PATH.'lib/class/AJAXChatTemplate.php'); require(AJAX_CHAT_PATH.'lib/class/CustomAJAXChat.php'); require(AJAX_CHAT_PATH.'lib/class/CustomAJAXChatShoutBox.php'); require(AJAX_CHAT_PATH.'lib/class/CustomAJAXChatInterface.php'); -?>
\ No newline at end of file |