diff options
| author | Philip Nicolcev <frugen@gmail.com> | 2016-04-30 15:20:55 -0400 |
|---|---|---|
| committer | Philip Nicolcev <frugen@gmail.com> | 2016-04-30 15:20:55 -0400 |
| commit | 1f990ab0ad8bbd99e9654f6e0042083e051f45a1 (patch) | |
| tree | c962f83370418f32e92d1623b974222d3da62afe /chat/lib/class/AJAXChatEncoding.php | |
| parent | 0b66fe6980a150c32a842c4ca63dd5c596e61388 (diff) | |
| parent | 6a4c92984fbe42e4633a6a65792847973f7d36da (diff) | |
| download | AJAX-Chat-origin/phpbb3.1.zip AJAX-Chat-origin/phpbb3.1.tar.gz AJAX-Chat-origin/phpbb3.1.tar.bz2 | |
Merge branch 'master' into phpbb3.1origin/phpbb3.1
Conflicts:
chat/lib/custom.php
Diffstat (limited to 'chat/lib/class/AJAXChatEncoding.php')
| -rw-r--r-- | chat/lib/class/AJAXChatEncoding.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chat/lib/class/AJAXChatEncoding.php b/chat/lib/class/AJAXChatEncoding.php index 96b2482..136d54b 100644 --- a/chat/lib/class/AJAXChatEncoding.php +++ b/chat/lib/class/AJAXChatEncoding.php @@ -135,4 +135,3 @@ class AJAXChatEncoding { } } -?>
\ No newline at end of file |