Merge branch 'main' of http://91.189.216.43:3000/jacek.pyziak/crmPRO
This commit is contained in:
27
.vscode/ftp-kr.sync.cache.json
vendored
27
.vscode/ftp-kr.sync.cache.json
vendored
@@ -203,20 +203,47 @@
|
||||
"layout": {
|
||||
"style.css": {
|
||||
"type": "-",
|
||||
<<<<<<< HEAD
|
||||
"size": 22693,
|
||||
"lmtime": 1765311863239,
|
||||
=======
|
||||
"size": 22678,
|
||||
<<<<<<< HEAD
|
||||
"lmtime": 1764150215841,
|
||||
=======
|
||||
"lmtime": 1764183540355,
|
||||
>>>>>>> adab4009ea3d5c884248109e64208485f9841267
|
||||
>>>>>>> 8879b273f5ab44239eb02fd30e324c23f0b30ae8
|
||||
"modified": false
|
||||
},
|
||||
"style.css.map": {
|
||||
"type": "-",
|
||||
<<<<<<< HEAD
|
||||
"size": 40598,
|
||||
"lmtime": 1765311863239,
|
||||
=======
|
||||
"size": 40575,
|
||||
<<<<<<< HEAD
|
||||
"lmtime": 1764150215841,
|
||||
=======
|
||||
"lmtime": 1764183540367,
|
||||
>>>>>>> adab4009ea3d5c884248109e64208485f9841267
|
||||
>>>>>>> 8879b273f5ab44239eb02fd30e324c23f0b30ae8
|
||||
"modified": false
|
||||
},
|
||||
"style.scss": {
|
||||
"type": "-",
|
||||
<<<<<<< HEAD
|
||||
"size": 28215,
|
||||
"lmtime": 1765311862998,
|
||||
=======
|
||||
"size": 28194,
|
||||
<<<<<<< HEAD
|
||||
"lmtime": 1764150215424,
|
||||
=======
|
||||
"lmtime": 1764183540380,
|
||||
>>>>>>> adab4009ea3d5c884248109e64208485f9841267
|
||||
>>>>>>> 8879b273f5ab44239eb02fd30e324c23f0b30ae8
|
||||
"modified": false
|
||||
}
|
||||
},
|
||||
|
||||
@@ -382,7 +382,7 @@ $config = array(
|
||||
//Allowed extensions (lowercase insert)
|
||||
//**********************
|
||||
'ext_img' => array( 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'ico', 'webp' ), //Images
|
||||
'ext_file' => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz','dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'tiff',''), //Files
|
||||
'ext_file' => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz','dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'tiff','ttc'), //Files
|
||||
'ext_video' => array( 'mov', 'mpeg', 'm4v', 'mp4', 'avi', 'mpg', 'wma', "flv", "webm" ), //Video
|
||||
'ext_music' => array( 'mp3', 'mpga', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav' ), //Audio
|
||||
'ext_misc' => array( 'zip', 'rar', 'gz', 'tar', 'iso', 'dmg' ), //Archives
|
||||
|
||||
Reference in New Issue
Block a user