mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-02-10 18:05:41 +08:00
Merge branch release/v9.1.0 into hotfix/v9.2.0
This commit is contained in:
1
Common/3dParty/socketio/.gitignore
vendored
1
Common/3dParty/socketio/.gitignore
vendored
@ -1 +1,2 @@
|
||||
socket.io-client-cpp/
|
||||
socketio.data
|
||||
@ -0,0 +1,5 @@
|
||||
<<<<<<<
|
||||
if((c >= 'a' && c <= 'z') || (c>= 'A' && c<= 'Z') || (c >= '0' && c<= '9')){
|
||||
=======
|
||||
if((c >= 'a' && c <= 'z') || (c>= 'A' && c<= 'Z') || (c >= '0' && c<= '9') || ('-' == c) || ('_' == c) || ('.' == c) || ('~' == c)){
|
||||
>>>>>>>
|
||||
Reference in New Issue
Block a user