Commit Graph

6907 Commits

Author SHA1 Message Date
Evgenia Sudarikova
c896268f67
Update docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-14 09:12:31 +03:00
Evgenia Sudarikova
98bb44785e
Update docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-14 09:12:25 +03:00
Evgenia Sudarikova
c2d75e7f45
Update docs/ru/operations/system-tables/dictionaries.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-14 09:12:19 +03:00
Evgenia Sudarikova
baa0078c0d
Update docs/ru/getting-started/install.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-14 09:12:09 +03:00
Vitaly Baranov
284171517f
Merge pull request #23940 from sevirov/sevirov-DOCSUP-7668-update_the_sql_statement_create_alter_user
DOCSUP-7668: Update the SQL-statement CREATE/ALTER USER
2021-05-14 08:37:54 +03:00
Dmitriy
2c9530484d Update user.md
Сделал ссылку на GRANT OPTION.
2021-05-14 00:46:57 +03:00
Denny Crane
18aee2f7f5
Update settings.md
better background_pool_size russian description
2021-05-13 17:31:05 -03:00
Dmitriy
9b9d692782 Update deltasum.md
Убрал лишний отступ.
2021-05-13 23:27:33 +03:00
sevirov
4cd4b94ef6
Update docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 23:12:00 +03:00
sevirov
975d49bf63
Update docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 23:11:51 +03:00
sevirov
c1983e2e8c
Update docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 23:11:37 +03:00
sevirov
fbca7fdfa8
Update docs/en/sql-reference/aggregate-functions/reference/deltasum.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 23:11:28 +03:00
sevirov
fc0a36f404
Update docs/en/sql-reference/aggregate-functions/reference/deltasum.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 23:11:16 +03:00
Dmitriy
7e235f9836 corrections according to the comments
Исправил согласно комментариям в PR.
2021-05-13 23:05:11 +03:00
adevyatova
9cd33b5837 add ru docs 2021-05-13 19:32:28 +00:00
adevyatova
7a0ec69f37 add example 2021-05-13 19:24:41 +00:00
Evgenia Sudarikova
4c7c2ac863
Update docs/ru/sql-reference/functions/type-conversion-functions.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 21:51:09 +03:00
Evgenia Sudarikova
8bdd08b63d
Update docs/ru/sql-reference/functions/type-conversion-functions.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 21:51:01 +03:00
Evgenia Sudarikova
f2307b23e3
Update docs/ru/sql-reference/functions/type-conversion-functions.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 21:50:56 +03:00
Evgenia Sudarikova
79f8265897
Update docs/ru/sql-reference/functions/type-conversion-functions.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 21:50:38 +03:00
Evgenia Sudarikova
1130632093
Update docs/ru/sql-reference/functions/type-conversion-functions.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 21:49:42 +03:00
Evgenia Sudarikova
cd10e84f5c
Update docs/ru/sql-reference/functions/type-conversion-functions.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 21:49:30 +03:00
Evgenia Sudarikova
678705b004
Update docs/ru/sql-reference/functions/ip-address-functions.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-13 21:49:03 +03:00
Anna
5555fcd7e7
Merge branch 'master' into annadevyatova-DOCSUP-8209-dictGetOrNull 2021-05-13 21:19:28 +03:00
adevyatova
6e3a1d4e99 update 2021-05-13 18:18:26 +00:00
adevyatova
2ef60f8eaa minor fixes 2021-05-13 18:10:39 +00:00
adevyatova
4ee1896faf add ru docs 2021-05-13 18:08:38 +00:00
Anna
e92e66c01e
Merge branch 'master' into annadevyatova-DOCSUP-8026-replicated 2021-05-13 20:49:19 +03:00
adevyatova
6100245f75 update 2021-05-13 17:45:26 +00:00
Evgeniia Sudarikova
00d963d40f minor changes 2021-05-13 20:26:03 +03:00
Evgeniia Sudarikova
0b66aa0e85 edited EN and RU 2021-05-13 20:05:58 +03:00
Evgeniia Sudarikova
dc6eb48197 edited after review 2021-05-13 18:05:48 +03:00
Maksim Kita
e0b3b7d661
Merge pull request #23847 from olgarev/revolg-DOCSUP-8778-cache_dictionaries_3
DOCSUP-8778: cache dictionaries (3)
2021-05-13 17:15:41 +03:00
Maksim Kita
de785ae107
Update external-dicts-dict-lifetime.md 2021-05-13 17:15:19 +03:00
Maksim Kita
cd9561e34b
Update external-dicts-dict-lifetime.md 2021-05-13 17:14:55 +03:00
Vladimir
7c77dd1e21
Minor changes in splitByRegexp 2021-05-13 12:21:00 +03:00
abel-wang
51c1d7c7ba split into characters when split by '' & add docs 2021-05-13 11:15:38 +08:00
Dmitriy
107054c9cd Update deltasumtimestamp.md
Поставил недостающие запятые.
2021-05-12 22:58:04 +03:00
sevirov
42152a4cc0
Update docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 22:55:57 +03:00
sevirov
6747151c6d
Update docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 22:55:45 +03:00
sevirov
3bdc52eae0
Update docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 22:55:25 +03:00
Dmitriy
6616b670e9 Update deltaSum and deltaSumTimestamp functions
Внес небольшие правки.
2021-05-12 22:52:52 +03:00
sevirov
cde5009ee8
Update docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 21:27:22 +03:00
sevirov
3c1aaba9f3
Update docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 21:27:10 +03:00
sevirov
402674ab86
Update docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 21:26:51 +03:00
sevirov
38fb75fa03
Update docs/en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 21:26:34 +03:00
sevirov
3ff1c87d1a
Update docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 21:26:23 +03:00
sevirov
303d6b145d
Update docs/ru/engines/table-engines/integrations/s3.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 21:26:00 +03:00
sevirov
11111d49f6
Update docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 21:25:16 +03:00
sevirov
8e3d197534
Update docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 21:22:15 +03:00
sevirov
de13b20f11
Update docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 21:21:45 +03:00
sevirov
8bad7f6112
Update docs/en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-05-12 21:21:26 +03:00
Serg Kulakov
6081f36a2c
Update cloud.md 2021-05-12 19:04:30 +03:00
Serg Kulakov
c774550abc
Update cloud.md 2021-05-12 18:31:16 +03:00
olgarev
46f52ca211
Update docs/ru/operations/utilities/clickhouse-format.md
Co-authored-by: alesapin <alesapin@gmail.com>
2021-05-12 15:15:02 +03:00
olgarev
447c73ce14
Apply suggestions from code review
Co-authored-by: alesapin <alesapin@gmail.com>
2021-05-12 15:11:44 +03:00
Nikita Mikhalev
ad73b7440f
Adding a note that Buffer engine does not support TRUNCATE statement 2021-05-12 11:00:13 +05:00
Nikita Mikhalev
4e5d456216
Adding a note that Buffer engine does not support TRUNCATE statement 2021-05-12 10:57:57 +05:00
alexey-milovidov
d422e0199b
Merge pull request #24019 from Avogar/rename-uniq-theta
Rename uniqThetaSketch to uniqTheta
2021-05-12 01:17:18 +03:00
olgarev
8f6453686f
Apply suggestions from code review 2021-05-12 00:08:46 +03:00
m-ves
424d555306
Correct mistyping 2021-05-11 23:32:58 +03:00
Maksim Kita
106a04c1e0
Merge pull request #23984 from michon470/kuriatnikovm-DOCSUP-9168-function_arrayProduct
DOCSUP-9168: Documented the arrayProduct function
2021-05-11 21:15:19 +03:00
Maksim Kita
72d46beca0
Merge pull request #23979 from azat/dict-preallocate
Reimplement preallocate for hashed/sparse_hashed dictionaries
2021-05-11 20:15:46 +03:00
Mikhail
d637f85033 перевод 2021-05-11 18:07:54 +03:00
Mikhail
3792e97ef3 Update array-functions.md 2021-05-11 17:56:57 +03:00
Pavel Kruglov
704bbe0aeb Raname uniqThetaSketch to uniqTheta 2021-05-11 17:39:35 +03:00
sevirov
a11ae00190
Update docs/ru/sql-reference/statements/alter/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-11 16:32:58 +03:00
sevirov
0a69a33d64
Update docs/ru/sql-reference/statements/alter/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-11 16:32:16 +03:00
Alexey Milovidov
e85d87feec Remove Russian admin tips as they are not updated 2021-05-11 12:19:55 +03:00
Kruglov Pavel
fb038c1985
Merge pull request #23894 from pingyu/datasketches-uniq-again
Add uniqThetaSketch again
2021-05-11 11:24:43 +03:00
Nikolai Kochetov
4ff612f2c3
Merge pull request #23701 from sevirov/sevirov-DOCSUP-5885-update_the_sql_statement_explain_ast
DOCSUP-5885: Update the SQL-statement EXPLAIN AST
2021-05-11 11:14:51 +03:00
Dmitriy
c80042682d Fix links
Поправил ссылки.
2021-05-11 00:06:24 +03:00
Dmitriy
10eaa83a48 Merge remote-tracking branch 'remotes/clickhouse/master' into sevirov-DOCSUP-8940-edit_and_translate_to_russian_deltasumtimestamp 2021-05-10 23:16:58 +03:00
Dmitriy
32cfb29edf Edit and translate to Russian
Выполнил перевод на русский язык.
2021-05-10 23:04:35 +03:00
Dmitriy
d0db5623c1 Translate to Russian
Выполнил перевод на русский язык.
2021-05-10 22:51:26 +03:00
michon470
91a9ae22e1
Update docs/en/sql-reference/functions/array-functions.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-10 19:13:53 +03:00
michon470
a13a070eee
Update docs/en/sql-reference/functions/array-functions.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-10 19:13:31 +03:00
michon470
704adf3b88
Update docs/en/sql-reference/functions/array-functions.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-10 19:13:16 +03:00
Vladimir
d02d14fa00
Merge pull request #23846 from excitoon-favorites/s3regions 2021-05-10 12:14:08 +03:00
Maksim Kita
6de38e8857
Merge pull request #23758 from excitoon-favorites/tdigestnotes
Documentation fix for `quantileTDigestWeighted`
2021-05-10 10:57:07 +03:00
Azat Khuzhin
808d1a0215 Reimplement preallocate for hashed/sparse_hashed dictionaries
It was initially implemented in #15454, but was reverted in #21948 (due
to higher memory usage).

This implementation differs from the initial, since now there is
separate attribute to enable preallocation, before it was done
automatically, but this has problems with duplicates in the source.

Plus this implementation does not uses dynamic_cast, instead it extends
IDictionarySource interface.
2021-05-10 07:41:48 +03:00
Mikhail
bed28e09c3 Update array-functions.md 2021-05-10 02:25:54 +03:00
sevirov
b95594b5d3
Update docs/en/sql-reference/statements/create/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-09 18:50:11 +03:00
sevirov
6e819f9f80
Update docs/en/sql-reference/statements/alter/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-09 18:50:03 +03:00
sevirov
89f9f7def6
Update docs/en/sql-reference/statements/create/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-09 18:49:44 +03:00
sevirov
359bef442f
Update docs/en/sql-reference/statements/create/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-09 18:49:37 +03:00
sevirov
2724f3fc48
Update docs/en/sql-reference/statements/create/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-09 18:49:30 +03:00
sevirov
81e02e821f
Update docs/en/sql-reference/statements/alter/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-09 18:49:21 +03:00
sevirov
0d75d7b87c
Update docs/en/sql-reference/statements/alter/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-09 18:49:09 +03:00
sevirov
dca6207835
Update docs/en/sql-reference/statements/alter/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-09 18:48:56 +03:00
sevirov
58d94f5dea
Update docs/en/sql-reference/statements/alter/user.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-09 18:48:28 +03:00
Azat Khuzhin
e08389b2d2 Add interface for rate of found elements in the dictionaries
- IDictionary abstraction
- skeleton implementation into each dictionary
- system.dictionaries.found_rate
- documentation changes
2021-05-08 17:09:01 +03:00
Dmitriy
da82898c1c Delete the original article
Удалил ссылки на оригинальную статью.
2021-05-08 00:13:14 +03:00
Dmitriy
8817c75750 Add the GRANTEES clause
Добавил новую секцию GRANTEES для запросов CREATE USER and ALTER USER.
2021-05-07 23:49:15 +03:00
Maksim Kita
af740ba61d
Update cloud.md 2021-05-07 15:16:40 +03:00
Maksim Kita
01f66eb58c
Update cloud.md 2021-05-07 15:15:29 +03:00
Maksim Kita
8451c8cf26
Merge branch 'master' into master 2021-05-07 15:14:48 +03:00
Vladimir Goncharov
800c4f27b5
Update index.md
MATERIALIZE INDEX, доперевёл доку на основе английского
2021-05-06 18:40:52 +03:00
alexey-milovidov
264b30d738
Update row-policy.md 2021-05-06 16:27:59 +03:00
alexey-milovidov
0448c412bf
Update access-rights.md 2021-05-06 16:27:22 +03:00
Julian Zhou
645b4cc0ac Update cloud document with ClickHousing releaseing on Alibaba Cloud international site. 2021-05-06 10:10:36 +08:00
ice1x
d748560991
Update build-osx.md 2021-05-05 19:56:20 +05:00
ice1x
dc595f391e
Add run options with default config path
Add run options with default config path.
Checked on Catalina 10.15.7
2021-05-05 19:35:28 +05:00
Maksim Kita
6105a19357
Merge pull request #23869 from kirillikoff/kirillikoff-DOCSUP-8495
DOCSUP-8495: Documented http-max-uri-size
2021-05-05 15:27:42 +03:00
alexey-milovidov
bf8c28a17f
Merge pull request #23885 from azat/dist-broken-metrics
Add metrics for broken files during async distributed sends
2021-05-05 13:41:15 +03:00
pingyu
46f809d07f Revert "Merge pull request #23334 from ClickHouse/revert-22609-datasketches-uniq"
This reverts commit af2499359b, reversing
changes made to db82e9e3d5.
2021-05-05 16:42:57 +08:00
Oleg Strokachuk
04e3fa1834 Doc. Fix title link for send_crash_reports for en and ru 2021-05-05 11:33:38 +03:00
Azat Khuzhin
74269882f7 Add broken_data_files/broken_data_compressed_bytes into distribution_queue 2021-05-04 22:48:07 +03:00
Tatiana Kirillova
cba158037e Merge branch 'kirillikoff-DOCSUP-8495' of https://github.com/kirillikoff/ClickHouse into kirillikoff-DOCSUP-8495 2021-05-04 15:58:10 +03:00
Tatiana Kirillova
5bc025ecae translation to ru 2021-05-04 15:54:13 +03:00
kirillikoff
0e92cc06df
Update docs/en/operations/settings/settings.md
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
2021-05-04 15:09:15 +03:00
Evgeniia Sudarikova
458cd6961c minor changes 2021-05-04 13:19:45 +03:00
Evgeniia Sudarikova
47a4ae930f edited 2021-05-03 23:44:46 +03:00
Tatiana Kirillova
c763a5c33f max-uri-size 2021-05-03 20:16:44 +03:00
alexey-milovidov
b868cabfa9
Update functions-for-nulls.md 2021-05-03 13:40:54 +03:00
alexey-milovidov
41a6fd677e
Update functions-for-nulls.md 2021-05-03 13:39:10 +03:00
Maksim Kita
88bc575ec8 Updated load instruction from master for ru, zh, ja documentations 2021-05-02 14:19:11 +03:00
eaxdev
669f6d22bd fix queries 2021-05-02 14:14:40 +03:00
eaxdev
be4d7d8636 actualize doc 2021-05-02 14:14:28 +03:00
Olga Revyakina
9cdc3fa957 Start 2021-05-01 20:46:02 +03:00
Vladimir Chebotarev
bc509066ba Added S3 region to documentation. 2021-05-01 20:45:37 +03:00
Dmitriy
4587828161 Update explain.md
Внес небольшие правки.
2021-05-01 19:50:57 +03:00
filimonov
30d433e108
Update install.md 2021-04-30 15:23:12 +02:00
olgarev
bfb5ffc398
Merge branch 'master' into revolg-DOCSUP-8776-backslash_option 2021-04-30 10:07:49 +03:00
Olga Revyakina
a74111c5b5 Additional fixes 2021-04-30 10:05:33 +03:00
Olga Revyakina
1f1ec13ac5 Links updated 2021-04-30 10:00:53 +03:00
Maksim Kita
f537a6ee51
Merge pull request #23755 from imyangmo/patch-1
Corrected some translation errors
2021-04-30 09:52:26 +03:00
fancno
1794bff6af
Update array-functions.md
change arryjoin to arrayJoin
2021-04-29 19:40:44 +08:00
Maksim Kita
b083432e6e
Merge pull request #23749 from aqingyan/patch-1
Update functions.md
2021-04-29 14:16:56 +03:00
Vladimir Chebotarev
aeea0610a4 Documentation fix for quantileTDigestWeighted. 2021-04-29 14:15:46 +03:00
Lucid Dreams
6bdcd11697
Corrected some translation errors
Fixed some translation seems to be translated by machine, which could cause mis-understanding.
2021-04-29 17:55:40 +08:00
Nikolai Kochetov
2a58ebd3d1
Merge pull request #22979 from michon470/kuryatnikovm-DOCSUP-8022-prefer_column_name_to_alias
DOCSUP-8022: setting prefer_column_name_to_alias documentated
2021-04-29 12:01:01 +03:00
alexey-milovidov
f552cf7cc6
Update build.md 2021-04-29 06:56:36 +03:00
alexey-milovidov
5d08e20141
Update build.md 2021-04-29 06:54:31 +03:00
ermaotech
c6ea8a7082
Update functions.md 2021-04-29 11:46:32 +08:00
olgarev
4c40b7a9df
Apply suggestions from code review
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-04-29 06:39:01 +03:00
olgarev
b9e5a28829
Update docs/ru/operations/utilities/clickhouse-format.md 2021-04-29 06:28:00 +03:00
olgarev
96f739025c
Apply suggestions from code review
Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
2021-04-29 06:27:21 +03:00
Nikolai Kochetov
77233bbdbb Ignore cmake-in-clickhouse 2021-04-28 18:10:12 +03:00
Alexey Milovidov
b66f9af7ce Update documentation for min/max 2021-04-28 04:41:38 +03:00
alexey-milovidov
76c78e3cec
Update max.md 2021-04-28 04:37:44 +03:00
alexey-milovidov
d1fdc311be
Update min.md 2021-04-28 04:37:06 +03:00
Dmitriy
93bdeeaed1 Update EXPLAIN AST
Добавил поддержку всех запросов.
2021-04-27 19:32:48 +03:00
Nikolai Kochetov
96e84a44d1
Merge pull request #23594 from lehasm/alexey-sm-DOCSUP-6702-document-timezoneOffset
DOCSUP-6702: document the timezoneOffset function
2021-04-27 15:42:17 +03:00
Alexey
ddeb1a08ff extra new lines removed 2021-04-26 20:39:31 +00:00
Alexey
24867702ae ru arguments made as in timezoneOf function 2021-04-26 20:32:36 +00:00
Alexey
79c7aee342 datetime ru description synced with en 2021-04-26 20:13:15 +00:00
Alexey
06fbf600e7 Alias added and function name changed to timeZoneOffset
Changed links to russian Wikipedia
2021-04-26 20:04:58 +00:00
Alexey
df2ef72d98 Conflict resolving fixed 2021-04-26 19:52:14 +00:00
Alexey
66ac717dbe Conflict resolving fixed 2021-04-26 19:51:37 +00:00