diff options
| author | Philip Nicolcev <frugen@gmail.com> | 2016-04-30 15:54:09 -0400 |
|---|---|---|
| committer | Philip Nicolcev <frugen@gmail.com> | 2016-04-30 15:54:09 -0400 |
| commit | b1e8bfc2d510002b1166e60ddd439cb36233c0b9 (patch) | |
| tree | 79dba60ca467c2e48a46221c6007ed1cd0df273d /chat/lib/class/AJAXChatTemplate.php | |
| parent | 63e23a6afe77f624c13f9390682a5f362fb0d4c7 (diff) | |
| parent | 6a4c92984fbe42e4633a6a65792847973f7d36da (diff) | |
| download | AJAX-Chat-origin/xenforo.zip AJAX-Chat-origin/xenforo.tar.gz AJAX-Chat-origin/xenforo.tar.bz2 | |
Merge remote-tracking branch 'origin' into xenforoorigin/xenforo
Conflicts:
chat/lib/custom.php
Diffstat (limited to 'chat/lib/class/AJAXChatTemplate.php')
| -rw-r--r-- | chat/lib/class/AJAXChatTemplate.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chat/lib/class/AJAXChatTemplate.php b/chat/lib/class/AJAXChatTemplate.php index 16e53a7..839cbe5 100644 --- a/chat/lib/class/AJAXChatTemplate.php +++ b/chat/lib/class/AJAXChatTemplate.php @@ -326,4 +326,3 @@ class AJAXChatTemplate { } } -?> |