robcaulk
fc837c4daa
add freqao backend machinery, user interface, documentation
2022-05-15 17:38:58 +02:00
Matthias
044afdf7af
Add better test scenario
2022-05-10 20:27:24 +02:00
Matthias
0958c06b84
Implement database migration to other system
2022-05-09 20:58:40 +02:00
Matthias
910addd02b
Merge pull request #6753 from freqtrade/download_prepend
...
Download prepend
2022-05-01 15:15:16 +02:00
Matthias
d5fc923dcb
Properly validate stoploss existence for optimize commands
...
closes #6740
2022-05-01 09:53:46 +02:00
Matthias
f6a7e6b785
Add prepend option to download-data
2022-04-30 17:32:50 +02:00
Matthias
f1f4846053
Merge branch 'develop' into pr/samgermain/6558
2022-04-23 09:16:28 +02:00
Matthias
baefda80d1
Enable flake8 E226 rule
2022-04-11 18:02:06 +02:00
Matthias
9556af1e6c
Improve documentation for config imports
2022-04-10 10:14:34 +02:00
Matthias
16e64ddf97
Update docs for multi-config loading
2022-04-08 17:59:16 +02:00
Matthias
238ff6c9fe
Use better naming
2022-04-08 17:30:23 +02:00
Matthias
1435d26996
store config-file loading paths
2022-04-08 17:26:51 +02:00
Matthias
1ea49ce864
Support nested configurations
2022-04-08 15:50:44 +02:00
Matthias
aee0cfd17a
forcebuy_enable -> force_entry_enable
2022-04-08 13:39:41 +02:00
Matthias
ef2f8be526
Merge pull request #6653 from mkavinkumar1/renaming-forceentry-forceexit
...
renamed forceentry forceexit
2022-04-08 12:31:48 +02:00
மனோஜ்குமார் பழனிச்சாமி
f7020df097
Updating requested changes in PR #6653
2022-04-08 07:07:51 +05:30
மனோஜ்குமார் பழனிச்சாமி
9417bb01dc
Merge branch 'develop' into renaming-forceentry-forceexit
2022-04-08 00:01:51 +05:30
Matthias
1347107c1e
extract load_from_files to load_config
2022-04-07 20:15:06 +02:00
Matthias
673b3034ee
Simplify load_from_files
2022-04-07 20:05:51 +02:00
Matthias
3188d036a6
improve trading_mode handling
...
Ensure trading_mode is set by new-config
handle empty strings to default to spot.
closes #6663
2022-04-07 08:45:45 +00:00
Matthias
d5ec79c0b9
Update deprecated settings to support non-nested transitions
2022-04-06 19:09:34 +02:00
மனோஜ்குமார் பழனிச்சாமி
28f4a3b373
updated for PR #6653
2022-04-06 07:05:43 +05:30
Matthias
b1378efdeb
ignore_roi_if_buy_signal -> ignore_roi_if_entry_signal
2022-04-05 20:21:39 +02:00
Matthias
4897731030
use_sell_signal -> use_exit_signal
2022-04-05 20:10:20 +02:00
Matthias
5ce5c70be6
sell_profit_offset -> exit_profit_offset
2022-04-05 20:03:27 +02:00
Matthias
bba9629a2a
Rename sell_profit_only to exit_profit_only
2022-04-05 20:00:35 +02:00
மனோஜ்குமார் பழனிச்சாமி
8442fb915f
renamed
2022-04-05 16:01:53 +05:30
Matthias
7d3116f9fb
webhookbuy -> webhookentry
2022-04-04 19:32:27 +02:00
Matthias
eff636ba53
Update RPC message types to ENTRY
2022-04-04 19:29:15 +02:00
Matthias
125dff1dad
Properly deprecate webhook settings (with transition)
2022-04-04 19:21:13 +02:00
Matthias
5ecb695e50
Update deprecated notification settings
2022-04-04 19:17:11 +02:00
Sam Germain
b4b809ff8e
changed recursive to recursive_strategy_search
2022-03-31 08:16:21 -06:00
Sam Germain
f44ae494fb
Added recursive to configuration
2022-03-31 08:12:02 -06:00
Matthias
2d740230f7
price_last_balance renaming
2022-03-28 19:53:55 +02:00
Matthias
cee09493be
Update market order validation
2022-03-28 19:25:46 +02:00
Matthias
f70166270d
Update pricing to use entry/exit pricing
2022-03-28 07:07:46 +02:00
Matthias
9f863369bd
Migrate bid/ask strategy to entry/exit pricing
2022-03-27 18:58:46 +02:00
Matthias
bcf326a035
Initial steps to change bid/ask pricing to enter/exit
2022-03-27 18:03:49 +02:00
Matthias
0624817242
update unfilledtimeout settings to entry/exit
2022-03-26 11:55:11 +01:00
Matthias
b1e3ead88b
Merge branch 'develop' into feat/short
2022-03-22 20:28:38 +01:00
Matthias
eb08b92180
Raise exception when ticker_interval is set.
2022-03-20 09:01:36 +01:00
Matthias
66afc233db
Use Deprecated method for order_Time_in_force
2022-03-09 06:54:13 +01:00
Matthias
943d080f5e
Add test for order-types migration
2022-03-09 06:37:08 +01:00
Matthias
420cc5c595
deprecated-setting moval should delete old setting
2022-03-09 06:37:08 +01:00
Matthias
5d4386f037
Implement order_types validation
2022-03-09 06:37:08 +01:00
Matthias
3ff261e22c
Update order time in force to use entry/exit wording
2022-03-07 19:55:15 +01:00
Matthias
5ab72ac082
chore: realign enums imports
2022-03-03 07:07:33 +01:00
Matthias
70f4305dfa
don't allow short trades in spot mode
2022-02-21 19:19:12 +01:00
Matthias
0c6d92a7a6
Merge branch 'develop' into feat/short
2022-02-11 17:02:04 +01:00
Joe Schr
761f7fdefb
fix: linter
2022-02-04 13:14:55 +01:00
Joe Schr
e84a58de28
fix: don't use different configuration keys, just add as 2nd argument
2022-02-04 12:47:13 +01:00
Joe Schr
a3e045f69d
Plotting: add alias --backtest-filename for --export-filename
...
makes it easier to discover how to use this argument
2022-02-04 12:47:13 +01:00
Matthias
f090dcc597
Merge branch 'develop' into feat/short
2022-01-22 17:56:01 +01:00
Rokas Kupstys
5fffc5033a
Rework backtesting --no-cahche to --cache=[none, day, week, month].
...
Fix an issue where config modification during runtime would prevent use of cached results.
2022-01-19 11:44:35 +02:00
Rokas Kupstys
16861db653
Implement previous backtest result reuse when config and strategy did not change.
2022-01-15 17:30:40 +02:00
Matthias
ddfbe55e7c
Merge branch 'develop' into feat/short
2022-01-01 19:16:49 +01:00
Matthias
5a546855e6
Import TTLCache from cachetools
...
Importing from cachetools.ttl is deprecated, and will be removed in 5.0
2021-12-27 19:30:17 +01:00
Matthias
25e1142f89
Update Enum imports
2021-12-08 15:59:20 +01:00
Matthias
d89cbda7b8
Use candle_type_def where possible
2021-12-08 14:15:54 +01:00
Matthias
a58c2c4f6c
Update ccxt_compat tests to also test funding_rate
2021-12-07 06:31:39 +01:00
Matthias
9d79501c13
Add candletypes argument for convert-data
2021-12-05 10:26:00 +01:00
Matthias
6cc3f65a83
Add --trading-mode parameter
2021-11-07 10:52:20 +01:00
Matthias
60a5ded532
Don't convert telegram chat_id
...
closes #5840
2021-11-05 19:27:54 +01:00
Matthias
f472709438
Add option to show sorted pairlist
...
Allows easy copy/pasting of the pairlist to a configuration
2021-10-30 10:50:40 +02:00
Matthias
96f99699e0
Merge pull request #4606 from rextea/add_days_breakdown_to_backtesting_summary
...
Add days breakdown table to backtesting
2021-10-21 13:56:30 +02:00
Matthias
fa028c2134
Support day/week/month breakdowns
2021-10-21 06:58:40 +02:00
Matthias
47bba331c1
Merge branch 'develop' into pr/rextea/4606
2021-10-17 16:29:31 +02:00
Matthias
d4d57f0002
Document expansion of --pairs, add download-inactive
2021-10-17 16:09:56 +02:00
Matthias
aed919a05f
Simplify "no-space-configured" error handling by moving it to hyperopt_auto
2021-10-13 19:54:35 +02:00
Scott Lyons
95227376b6
Adding IUS to optimize args
2021-09-30 00:53:46 -07:00
Matthias
e4ec5679a1
Merge pull request #5574 from freqtrade/agefilter_cache
...
Agefilter cache
2021-09-15 06:33:36 +02:00
Matthias
3ce5197e8d
Add Tests for AgeFilter caching
...
closes #5552
2021-09-14 06:45:26 +02:00
Matthias
a12c3ecc9b
Remove credentials whenever dry-run is set from within the exchange
2021-09-13 20:27:32 +02:00
Matthias
3cdd06f562
Add PeriodicCache
2021-09-13 19:32:51 +02:00
Matthias
3406b889b6
First test
2021-08-14 17:06:28 +02:00
Matthias
8405ccc15e
Seperate detail data loading from regular backest-data loading
2021-08-14 16:33:01 +02:00
Matthias
88172fab82
Allow "detailed" backtesting timeframe to look into the candle
2021-08-14 16:04:23 +02:00
Matthias
6532aba765
Merge pull request #5360 from freqtrade/hyperopt_protections
...
Hyperopt protections and Boolean parameter
2021-08-07 09:42:05 +02:00
Sam Germain
b9356a5564
Autopep8 formatting
2021-08-06 16:35:39 -06:00
Matthias
a661e0db6e
Deprecate protections from config
2021-08-04 19:43:16 +02:00
Matthias
6f8519d0a3
Add environment variable support
2021-07-31 19:26:56 +02:00
Matthias
7b7d9c02d7
Merge pull request #5243 from freqtrade/feat/webservermode_progress
...
Introduce webserver mode subcommand
2021-07-18 10:48:55 +02:00
anasyusef
6a53e2c764
feat: apply censoring to logging
2021-07-12 12:08:01 +00:00
Matthias
97e8ec91f0
Save configuration file paths
2021-07-06 19:48:28 +02:00
Matthias
62cdbdc26a
Automatically export hyperopt parameters
2021-06-29 20:51:25 +02:00
Matthias
158cb415a9
Add settings interface to have types available
2021-06-26 17:28:37 +02:00
Matthias
b7f01a08f3
Update sequence of process_deprecated_setting parameters
2021-06-26 17:03:51 +02:00
Matthias
1067a9f356
Move strategy-override signals to top-level of the config
...
closes #2867
2021-06-26 16:06:13 +02:00
Matthias
60c7308126
Merge pull request #5183 from freqtrade/remove_order_book_max
...
Remove order book max
2021-06-26 14:56:10 +02:00
Matthias
59a33d0fa9
Add test for ask_orderbook validation
2021-06-25 20:52:34 +02:00
Matthias
d59a38665c
Remove support for order_book_max
2021-06-25 20:36:39 +02:00
aayush-jain18
d294ef10d7
unexpected docstring params
2021-06-25 23:56:16 +05:30
aayush-jain18
a46f60bd94
spell corrections
2021-06-25 22:10:04 +05:30
Matthias
9c34304cb9
Move state enums to enums package
2021-06-08 21:20:35 +02:00
Janos
812eb229df
plot-profit: Make "auto-open" HTML result optional
...
Adding an "--auto-open" argument.
This improves tool processing of the results, while still allowing to open the HTML file for easy use.
2021-06-02 21:33:26 +02:00
Matthias
2d7ccaeb3d
Add test for load_config
2021-05-30 20:14:54 +02:00
Matthias
4f529fe424
Don't use Arrow to get min/max backtest dates
2021-05-06 19:43:14 +02:00
Matthias
cb86c90d3e
Remove obsolete TODO's
2021-04-24 19:16:54 +02:00
Rokas Kupstys
09efa7b06b
Add --new-pairs-days parameter for download-data command.
...
This parameter allows us to customize a number of days we would like to download for new pairs only. This allows us to achieve efficient data update, downloading all data for new pairs and only missing data for existing pairs. To do that use `freqtrade download-data --new-pairs-days=3650` (not specifying `--days` or `--timerange` causes freqtrade to download only missing data for existing pairs).
2021-04-22 10:07:13 +03:00
Matthias
1eb9ce4227
Allow specifying pairs for optimize commands via --pairs
2021-04-17 10:47:32 +02:00
Matthias
4996bd443e
Merge pull request #4697 from freqtrade/docker_user
...
Docker as user
2021-04-10 08:19:25 +02:00
Matthias
898c24949b
Add chown method to support docker
2021-04-08 20:17:07 +02:00
Matthias
c36051be56
Merge pull request #4685 from freqtrade/ft_has
...
Use ccxt's has to check which exchanges can work with freqtrade
2021-04-07 10:47:56 +02:00
Matthias
a3b4667f7c
Update exchange validation to use "validate_exchange".
2021-04-06 20:16:29 +02:00
Matthias
56ef3af424
Allow comments in pairs files
2021-04-06 13:29:22 +02:00
Matthias
c7ee34687b
Merge pull request #4584 from withshubh/develop
...
fix: code quality issues
2021-04-02 15:19:49 +02:00
Matthias
2869d5368d
Allow edge to use dynamic pairlists
...
closes #4298
2021-03-30 20:20:24 +02:00
rextea
2bed41da5d
Add days breakdown table to backtesting
2021-03-26 18:40:50 +03:00
shubhendra
45da3a7022
Refactor unnecessary else / elif when if block has a continue statement
...
Signed-off-by: shubhendra <withshubh@gmail.com>
2021-03-21 17:14:47 +05:30
Matthias
16a54b3616
Don't require non-mandatory arguments
2021-03-20 13:08:02 +01:00
Matthias
fe7f3d9c37
Add price side validation for market orders
2021-03-20 11:48:39 +01:00
Matthias
0d5833ed91
Use OperationalException for TimeRange errors
2021-03-19 06:40:04 +01:00
Patrick Brunier
4d52732d30
Added a small snippet to give users a descent error message,
...
when their start date is afer the stop date.
Also updated the tests.
2021-03-18 22:38:54 +01:00
Matthias
ef9977fc1e
Make stake_amount + stake_currency mandatory for backtesting
2021-03-10 10:43:44 +01:00
Matthias
98f3142b30
Improve handling of backtesting params
2021-02-27 09:33:00 +01:00
Matthias
86f9409fd2
fix --stake-amount parameter
2021-02-27 09:33:00 +01:00
Matthias
959ff99046
Add Dry-run wallet CLI option
2021-02-27 09:32:59 +01:00
Matthias
31e0b09643
Rename config.json.example
...
it's really the config dedicated to bittrex,
so the name should reflect this in beeing config_bittrex.json.example
2021-01-22 19:18:34 +01:00
Matthias
e2d15f4082
Add parameter to enable protections for backtesting
2020-12-07 11:39:01 +01:00
Matthias
d4799e6aa3
Implement *candle definitions
2020-12-07 10:54:26 +01:00
Matthias
a93bb6853b
Document *candles settings, implement validations
2020-12-07 10:47:13 +01:00
Matthias
af1b3721fb
remove duplicate settings check
2020-11-27 20:28:17 +01:00
Matthias
95c3c45ec9
Remove long deprecated settings that moved from experimental to
...
ask_strategy
2020-11-27 20:24:32 +01:00
Matthias
006436a18d
Require use_sell_signal to be true for edge
...
Otherwise edge will have strange results, as
edge runs with sell signal, while the bot runs without sell signal,
causing results to be invalid
closes #3900
2020-11-24 07:47:35 +01:00
Matthias
ecddaa663b
Convert timestamp to int_timestamp for all arrow occurances
2020-10-13 06:24:01 +02:00
Matthias
6977ffdbf9
Merge branch 'develop' into isort_config
2020-09-28 20:21:55 +02:00
Matthias
253b7b763e
Apply isort to freqtrade codebase
2020-09-28 19:40:46 +02:00
Matthias
3cb1a9a5a9
Support loading results from a specific hyperopt history file
2020-09-27 17:03:30 +02:00
Matthias
b736691e0e
Remove hyperopt --continue
2020-09-27 16:18:28 +02:00
Matthias
309ea1246a
Update config to use single quotes
2020-08-26 20:52:09 +02:00
Matthias
3d515ed5bf
Merge pull request #3558 from freqtrade/bt_add_maxdrawdown
...
Revise backtesting export format, add some metrics
2020-08-19 06:39:47 +02:00
Matthias
688d657fe2
Merge branch 'develop' into pr/yazeed/3091
2020-08-11 20:04:43 +02:00
Matthias
7c5587aeaa
exportfilename can be a file or directory
2020-07-03 06:58:27 +02:00
Matthias
3517c86fa2
Fail if both ticker_interval and timeframe are present in a
...
configuration
Otherwise the wrong might be used, as it's unclear which one the intend
of the user is
2020-06-16 16:02:38 +02:00
hroff-1902
64881a94e2
Merge branch 'develop' into timeframe
2020-06-02 15:56:34 +03:00
Matthias
09fe3c6f5e
create compatibility code
2020-06-02 09:52:30 +02:00
Matthias
388573800c
Update configuration messages
2020-06-01 20:52:33 +02:00
Matthias
3139343946
Remove capital_available_percentage and raise instead
2020-06-01 19:58:28 +02:00
Matthias
56bb5f7a11
Add show-trades command
2020-05-02 11:26:12 +02:00
Matthias
d1a24db6b7
Remove deprecated pairlist and binary
2020-04-25 16:04:10 +02:00
Matthias
87f1060abc
Default docker to log into log-dir
2020-04-21 19:47:49 +02:00
Matthias
d581b7e2d7
Add fallback if no error could be determined
2020-03-23 07:57:30 +01:00
Matthias
8f7e113d79
Add additional test
2020-03-23 07:54:27 +01:00
Matthias
45aaa8c09d
Parse and show relevant configuration section
2020-03-22 20:09:01 +01:00
Yazeed Al Oyoun
1976aaf13e
initial push
2020-03-22 02:22:06 +01:00
Fredrik81
06198c0028
Missed configuration.py
2020-03-15 21:27:45 +01:00
Matthias
0f1640bed4
convert exportfilename to Path when config parsing
2020-03-15 09:39:45 +01:00
hroff-1902
51f52c8609
Merge branch 'develop' into no-ticker-2
2020-03-13 16:43:52 +03:00
hroff-1902
3208faf7ed
Do not use ticker where it's not a ticker
2020-03-08 20:47:02 +03:00
Fredrik81
7606d814fa
Initial work on csv-file export. Missing docs and tests
2020-03-05 01:58:33 +01:00
Matthias
a55964a622
we Must parse --dry-run before setting run-mode
2020-02-27 19:36:54 +01:00
Matthias
e5ec97495d
Logging should be initialized first
2020-02-27 07:01:00 +01:00
Matthias
3e4f663418
Move pairlist validation to exchange (we need to use .quote) from
...
markets
2020-02-24 21:33:42 +01:00
Matthias
6335d81ceb
Merge branch 'develop' into data_handler
2020-02-16 15:12:14 +01:00
Fredrik Rydin
539343b20d
Adding 2 more filter options for completeness
2020-02-11 21:29:55 +01:00
Fredrik Rydin
5b4d8d69ef
Adding --min-trades and --max-trades for hyperopt-list
2020-02-11 16:02:08 +01:00
Matthias
d65a06947d
Merge branch 'develop' into data_handler
2020-02-09 15:16:43 +01:00
Fredrik Rydin
636bd5acb5
Added filter options to "hyperopt-list" in order to easier find epochs.
...
--profitable
Select only profitable epochs.
--min-avg-time INT
Select epochs on above average time.
--max-avg-time INT
Select epochs on under average time.
--min-avg-profit FLOAT
Select epochs on above average profit.
--min-total-profit FLOAT
Select epochs on above total profit.
2020-02-08 23:21:42 +01:00
hroff-1902
f3d500085c
Add some type hints
2020-02-02 07:00:40 +03:00
Matthias
1b9af9d2d8
Merge branch 'develop' into data_handler
2020-01-26 20:31:13 +01:00
Matthias
02563019fc
move setup_utils_config to configuration module
2020-01-26 14:15:53 +01:00
Matthias
a3e9d04383
Adjust imports to new place for arguments
2020-01-26 13:46:01 +01:00
Matthias
7f851ad8d9
Move arguments and cli_options to commands module
2020-01-26 13:46:01 +01:00
Matthias
a1c684f67c
Simplify noqa setup for module imports
2020-01-26 13:46:01 +01:00
Matthias
f347e5934a
Small adjustments for moved commands
2020-01-26 13:46:01 +01:00
Matthias
b254bdfea3
Move plot_utils to plot_commands
2020-01-26 13:46:01 +01:00
Matthias
6e85280467
Adjust imports
2020-01-26 13:46:01 +01:00
Matthias
fc2970f41b
Merge branch 'develop' into data_handler
2020-01-21 06:58:48 +01:00
Matthias
d12a2a5888
Merge pull request #2752 from freqtrade/plotting/indicator_strategy
...
Allow enhanced plot-dataframe configuration
2020-01-13 19:53:15 +01:00
Matthias
a7246ba1ec
No need to "fix" stake_currency enum anymore
2020-01-11 12:51:42 +01:00
Matthias
a75420f75f
Merge branch 'develop' into relative_stake
2020-01-05 12:55:55 +01:00
Matthias
f82c4346b6
data conversion, not data conversation
...
* we're not talking to the data yet ...
2020-01-05 09:55:02 +01:00
Matthias
2409261cb7
Merge branch 'develop' into data_handler
2020-01-04 11:36:27 +01:00
Matthias
f04873b0b0
Add plot_config to interface
2020-01-04 11:14:00 +01:00
Matthias
7e7c82cf4a
Small adjustments to relative_stake PR
2020-01-03 11:34:17 +01:00
Matthias
f3beaa3374
Deprecate capital_available_percentage
2020-01-03 10:58:31 +01:00
Matthias
a8d56b2850
IMplement check for unlimited settings
...
verifying that either max_open_trades or stake_amount is set for
operations without edge
2020-01-03 07:07:59 +01:00
Matthias
9382b38c41
Fix mypy error
2020-01-02 10:56:00 +01:00
Matthias
22fcf7b4dc
Allow empty stake currency in certain cases
2020-01-02 10:47:37 +01:00
Matthias
9325880fe5
Split config-validation requires
2020-01-02 10:39:32 +01:00
Matthias
699c0d6bc3
Merge branch 'develop' into data_handler
2019-12-30 19:40:43 +01:00
Matthias
1ffda29fd2
Adjust improts to new exception location
2019-12-30 15:02:17 +01:00
Matthias
28787a001c
Move convert functions to convert module
2019-12-28 11:02:34 +01:00
Matthias
525550e4c7
Fix typo in parameter transition
2019-12-28 11:01:42 +01:00
Matthias
9c5b94adf5
Pass data_format to methods
2019-12-28 11:01:42 +01:00
Matthias
018e270336
Allow --pairs for convert arguments
2019-12-28 11:01:41 +01:00
Matthias
3d4f62081e
Allow timeframes for convert-data
2019-12-28 11:01:41 +01:00
Matthias
2a6b542b09
Add second subcommand to allow conversation of ohlcv and trades data
...
seprately
2019-12-28 11:01:41 +01:00
Matthias
e5a61667dd
Implement first version of jsondatahandler
2019-12-28 11:00:22 +01:00
Matthias
2496aa8e3f
Add convert-data template subcommands
2019-12-28 10:59:30 +01:00
hroff-1902
004993583b
Merge pull request #2712 from freqtrade/strategylist
...
add list-strategies subcommand
2019-12-28 12:32:06 +03:00
Matthias
2ab989e274
Cleanup some code and add option
2019-12-24 15:28:35 +01:00
Matthias
a68445692b
Add first steps for list-strategies
2019-12-24 12:44:41 +01:00
Matthias
bb8acc61db
Convert datadir within config to Path
...
(it's used as Path all the time!)
2019-12-23 15:11:29 +01:00
hroff-1902
95bd9e8e0b
No underscores in cli options
2019-12-22 00:17:51 +03:00
hroff-1902
0e4ef33d6a
Merge pull request #2581 from hroff-1902/hyperopt-list
...
Add hyperopt-list and hyperopt-show commands
2019-12-10 00:30:26 +03:00
hroff-1902
a9f7e9fb7a
Fix NO_CONF; fix tests
2019-12-09 12:49:04 +03:00
Matthias
ed7207d4c8
Show pairs which are wrong ...
2019-12-07 19:31:15 +01:00
Matthias
bb9235c715
Validate stake-currency against pairlist - making sure only correct
...
pairs are in the whitelist
2019-12-07 15:42:47 +01:00
hroff-1902
017a94adc1
Merge develop
2019-12-05 01:08:38 +03:00
