Matthias
fbb9075539
Update util command structures too
2021-04-17 10:53:03 +02:00
Matthias
6a9c47d15f
Update docs with new options
2021-04-17 10:48:24 +02:00
Matthias
c52edcff4d
Merge pull request #4677 from mads03dk/get_trade
...
Add API endpoint for getting a specific trade
2021-04-16 19:57:58 +02:00
Matthias
9f2b6ee9a5
Merge pull request #4740 from freqtrade/decimal_stoploss_Hyperopt
...
stoploss and roi skdecimal spaces hyperopt
2021-04-16 19:46:07 +02:00
Matthias
5c579613e1
add /trade endpoint to rest_client script
2021-04-16 19:42:13 +02:00
Matthias
e6936ae135
Improve wording in docs
2021-04-16 19:16:29 +02:00
Matthias
ccd4ef905e
Merge pull request #4742 from theomart/patch-2
...
Correct get_min_pair_stake_amount formula
2021-04-16 13:49:46 +02:00
Matthias
8ce5522a10
Add additional documentation for SKDecimal space
2021-04-16 08:00:04 +02:00
Matthias
2011912a19
Adapt documentation to use 3 decimals only
2021-04-16 07:46:00 +02:00
grillzoo
01b303e0f9
Aligning the doc
2021-04-15 21:58:07 +01:00
Matthias
a7f8da4bd5
Merge pull request #4713 from ugurcemozturk/patch-1
...
chore(readme): Fix markdown of docker manual
2021-04-15 16:16:02 +02:00
Matthias
7142787256
Roll back unintended changes that break rendering
2021-04-15 15:41:35 +02:00
JoeSchr
c9c039d640
remove copy()
from custom_info
example
...
`set_index` automatically copies if not stated otherwise with `inplace=True`
> inplacebool, default False
If True, modifies the DataFrame in place (do not create a new object).
from: https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.set_index.html?highlight=set_index#pandas.DataFrame.set_index
2021-04-15 15:21:28 +02:00
Matthias
862df2b431
Add blacklist recommendation for kucoin
...
closes #4738
2021-04-14 19:43:32 +02:00
Matthias
521e48c94a
Add doc section for Kucoin
...
part of #4723
2021-04-13 13:55:08 +02:00
Matthias
f1ac6853fc
Fix discord invite link
2021-04-12 11:11:53 +02:00
dependabot[bot]
c19ebc0157
Bump mkdocs-material from 7.1.0 to 7.1.1
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/docs/changelog.md )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/7.1.0...7.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-04-12 05:26:58 +00:00
Ugur Cem Ozturk
906c4e64d3
chore(readme): Fix markdown of docker manual
...
Link to docker-compose was pointing to the one from develop branch. It's changed as with the stable docker-compose.
2021-04-11 15:38:08 +03:00
Matthias
40fc9d4bfe
Merge pull request #4707 from gerrito333/develop
...
fix documentation inconsistency related to VolatilityFilter
2021-04-10 14:42:09 +02:00
gbojen
96a5b6555d
fix documentation inconsistency
...
fixes freqtrade/freqtrade#4650
2021-04-10 14:31:12 +02:00
Brook Miles
0b4b67e46b
add FAQ entries for shorting, futures, and options
2021-04-09 10:36:03 +09:00
Matthias
8cd3c05c39
Merge pull request #4686 from gerrito333/develop
...
Add Pairlist Handler for Volatility
2021-04-08 20:00:41 +02:00
Matthias
74bf0b6399
Fix typo in documentation
2021-04-08 19:29:51 +02:00
gbojen
862f69f895
removed typos
2021-04-08 16:43:38 +02:00
gbojen
f8244d9d76
resolves freqtrade/freqtrade#4650
2021-04-07 22:25:54 +02:00
Matthias
588c221df0
Merge pull request #4684 from aapopov92/patch-1
...
Improve Kraken-specific config description.
2021-04-07 19:20:16 +02:00
gbojen
17508efbbc
resolves freqtrade/freqtrade#4650
2021-04-07 08:59:44 +02:00
Matthias
7f8d90d34c
Update list-exchanges doc with new format
2021-04-07 07:05:10 +02:00
Aleksey Popov
b6599c1da9
Improve Kraken-specific config description.
...
Added Warning after Kraken rate limit config in order to clearly highlight that it holds delay between requests instead of req\sec rate.
2021-04-06 20:10:52 +02:00
Mads Sørensen
fc78246bbc
Some changes to rest-api docs
2021-04-05 19:34:01 +02:00
Mads Sørensen
ddba0d688e
Add new trade endpoint to docs
2021-04-05 19:32:55 +02:00
Matthias
3044aa18e6
Add warning for hyperopt-parameters
2021-04-05 14:45:42 +02:00
Matthias
b470672dfd
Merge pull request #4596 from rokups/rk/hyper-strategy
...
Support for creating auto-hyperoptable strategies.
2021-04-05 13:55:32 +02:00
dependabot[bot]
342f14472c
Bump mkdocs-material from 7.0.7 to 7.1.0
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 7.0.7 to 7.1.0.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/docs/changelog.md )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/7.0.7...7.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-04-05 05:26:45 +00:00
Matthias
c2be9b971c
Improve backtest assumptions with fill rules
2021-04-04 07:02:59 +02:00
Matthias
41cb2a6451
Merge branch 'develop' into pr/rokups/4596
2021-04-03 17:00:37 +02:00
Matthias
6555454bd2
Remove more ticker_interval occurances
2021-04-03 16:54:47 +02:00
Matthias
093d6ce8af
Add sample for Nested space
2021-04-03 16:13:49 +02:00
Matthias
c2d43a526c
Combine Legacy and advanced hyperopt sections
2021-04-03 16:08:08 +02:00
Matthias
32a503491d
Reorder hyperopt methods
2021-04-03 15:41:43 +02:00
Matthias
4eb7ce52cd
Remove duplicate entries from hyperopt_legacy
2021-04-03 15:38:52 +02:00
Rokas Kupstys
23c19b6852
New hyperopt documentation.
2021-04-03 11:19:52 +03:00
Matthias
e7a1924aa0
Fix typo
2021-04-03 08:36:06 +02:00
Matthias
7728e269fd
Include Technical in default image
2021-04-03 07:17:02 +02:00
Matthias
2869d5368d
Allow edge to use dynamic pairlists
...
closes #4298
2021-03-30 20:20:24 +02:00
dependabot[bot]
9322845740
Bump mkdocs-material from 7.0.6 to 7.0.7
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 7.0.6 to 7.0.7.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/docs/changelog.md )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/7.0.6...7.0.7 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-03-29 05:27:22 +00:00
Masoud Azizi
39bfe5e1a7
Thee to the
2021-03-26 20:51:14 +01:00
Matthias
8da7d5c009
Merge pull request #4594 from rextea/add_confirm_exit_enter_tade_to_backtesting
...
Add confirm_trade_exit and confirm_trade_entry to backtesting
2021-03-25 20:26:56 +01:00
rextea
d795febf92
Add info to documantation
2021-03-24 18:26:03 +02:00
Matthias
43d7f9ac67
Add bid_last_balance parameter
...
to interpolate sell prices
closes #3270
2021-03-20 14:38:26 +01:00
Matthias
066dd72210
add orderbook structure documentation
2021-03-20 08:34:15 +01:00
Matthias
0a9622a065
Merge pull request #4581 from freqtrade/fix/4578
...
Fix calculation error for min-trade-stake
2021-03-20 08:21:52 +01:00
Matthias
69799532a6
Document usage of open_date_utc
...
closes #4580
2021-03-20 08:13:56 +01:00
Matthias
7ffe1fd36a
Fix calculation error for min-trade-stake
2021-03-20 07:21:22 +01:00
Matthias
fb90901bb3
Fix telegram table for both rendered and github markdown
2021-03-19 20:12:12 +01:00
Maycon Maia Vitali
c1f7992270
Added slash to fix a broken formatting
...
On the command table the pipe(|) broke the formatting.
2021-03-19 10:39:45 -03:00
Matthias
84ca9bd2c7
Merge pull request #4543 from brookmiles/fix-math-custom-stoploss-docs
...
correct math used in examples and clarify some terminology regarding …
2021-03-18 19:32:30 +01:00
Matthias
dd4d1d82d4
Update docs/strategy-advanced.md
2021-03-18 14:19:33 +01:00
Brook Miles
bf14796d4c
revert "Trailing stoploss with positive offset" example as stoploss_from_open() wasn't adding value
2021-03-18 21:50:54 +09:00
Matthias
b6e9e74a8b
Add link between stoploss_from_open and custom_stop documentation
2021-03-18 06:46:08 +01:00
Brook Miles
983c0ef118
update stoploss_from_open examples to use helper function
2021-03-18 09:47:03 +09:00
Matthias
b05de6d468
Move advanced exchange config to exchange page
2021-03-17 19:36:35 +01:00
Brook Miles
aee2591490
add stoploss_from_open() as a strategy_helper
2021-03-17 17:58:23 +09:00
dependabot[bot]
22c34faca3
Bump mkdocs-material from 7.0.5 to 7.0.6
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 7.0.5 to 7.0.6.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/docs/changelog.md )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/7.0.5...7.0.6 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-03-15 05:28:02 +00:00
Matthias
0b35c0571f
Allow custom fee to be used during dry-run
...
closes #3696
2021-03-14 19:37:57 +01:00
Brook Miles
e924416431
correct math used in examples and clarify some terminology regarding custom stoploss functions
2021-03-14 22:02:53 +09:00
Matthias
eb4f05eb23
Add documentation for hyperopt.strategy availability
2021-03-13 16:47:12 +01:00
Matthias
ef9977fc1e
Make stake_amount + stake_currency mandatory for backtesting
2021-03-10 10:43:44 +01:00
Matthias
0db5c9746f
Merge pull request #4454 from freqtrade/backtest_compound_speed
...
Backtest compound, wallet, ...
2021-03-10 10:07:40 +01:00
Matthias
60f6b998d3
Update logo with smiling one
2021-03-10 09:27:03 +01:00
dependabot[bot]
a9c114d301
Bump mkdocs-material from 7.0.3 to 7.0.5
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 7.0.3 to 7.0.5.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/docs/changelog.md )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/7.0.3...7.0.5 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-03-08 05:28:27 +00:00
Matthias
a405d578da
Introduce forcebuy ordertype to allow specifiying a different ordertype for forcebuy / forcesells
2021-03-05 20:22:04 +01:00
Matthias
bc05d03126
Make best / worst day absolute
2021-03-05 19:21:09 +01:00
JoeSchr
dfeafc2204
Update docs/strategy-customization.md
...
Co-authored-by: Matthias <xmatthias@outlook.com>
2021-03-04 20:05:27 +01:00
JoeSchr
161a4656d5
Update docs/strategy-advanced.md
...
Co-authored-by: Matthias <xmatthias@outlook.com>
2021-03-04 20:05:21 +01:00
Joe Schr
1304918a29
fix(docs/strategy-advanced/custom_info-storage/example): only add to "custom_info" in backtesting and hyperopt
2021-03-04 20:03:43 +01:00
Joe Schr
900deb663a
fix(docs/strategy-advanced/custom_stoploss/example): check if "pair" exists in "custom_info" before requesting
2021-03-04 20:03:43 +01:00
Joe Schr
c56b9cd751
fix(docs/strategy-advanced): add warnings
2021-03-04 20:03:43 +01:00
Joe Schr
a6ef354a5f
fix(docs/strategy-advanced): use get_analyzed_dataframe()
instead of custom_info.iloc
2021-03-04 20:03:43 +01:00
Joe Schr
22a558e331
fix(docs/strategy-advanced): fix link to custom_info storage
2021-03-04 20:03:42 +01:00
Joe Schr
1a02a146a1
feature(docs/strategy-advanced/custom_info-storage/example): add ATR column calculation
2021-03-04 20:03:42 +01:00
Joe Schr
4064f856d1
fix(docs/strategy-customization): add "hyperopt" to runmode check for custom_info in custom_stoploss example
2021-03-04 20:03:42 +01:00
Joe Schr
b52698197b
refactor(docs/strategy-advanced): extract "Storing information" section from strategy-customization.md
2021-03-04 20:03:42 +01:00
Joe Schr
d05acc30fa
fix(docs/strategy-customization): remove superflous prints
from example code
2021-03-04 20:03:42 +01:00
Joe Schr
32f35fcd90
fix(docs/strategy-customization): "custom_stoploss indicator" example need to check for RUN_MODE
2021-03-04 20:03:42 +01:00
Joe Schr
c5900bbd38
feature(docs/strategy-customization): add example "Custom stoploss using an indicator from dataframe"
2021-03-04 20:03:42 +01:00
Joe Schr
cc4e84bb70
feature(docs/strategy-customization): add example how to store indicator with DatetimeIndex into custom_info
2021-03-04 20:03:42 +01:00
Joe Schr
5cf3194fab
chore(docs/strategy-customization): clean up left over trailing whitespaces
2021-03-04 20:03:42 +01:00
Joe Schr
d5993db064
refactor(docs/strategy-customization): change variable name for better readability
...
`cust_info` -> `custom_info`
2021-03-04 20:03:42 +01:00
Matthias
6eb253c31e
Merge pull request #4469 from freqtrade/rpc/locks
...
Add RPC methods to remove locks
2021-03-02 10:41:08 +01:00
Matthias
007ac7abb5
Add telegram pair unlocking
2021-03-01 20:09:40 +01:00
Matthias
6640156ac7
Support deleting locks via API
2021-03-01 19:50:39 +01:00
Matthias
4e51364057
Add warning about sandboxes
...
closes #4468
2021-03-01 19:12:02 +01:00
Matthias
64ef7becc7
Update styles to work with new mkdocs version
2021-03-01 09:35:35 +01:00
dependabot[bot]
00747a3bc3
Bump mkdocs-material from 6.2.8 to 7.0.3
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 6.2.8 to 7.0.3.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/docs/changelog.md )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/6.2.8...7.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-03-01 05:31:43 +00:00
Matthias
54ccbd9370
Merge pull request #4391 from squat0001/develop
...
Add dust level to balance command in telegram
2021-02-28 10:36:44 +01:00
Matthias
a13dc3cdde
Use sensible defaults for balance_dust_level
2021-02-28 09:57:52 +01:00
JoeSchr
e791ff6042
Fix: custom_stoploss returns typo
...
Afaik it should return -0.07 for 7% instead of -0.7.
As a side note, really interesting would also be an example for greater than 100% profits. especially when trailing stoploss, like
* Once profit is > 200% - stoploss will be set to 150%.
I assume it could be as simple as
```py
if current_profit > 2:
return (-1.50 + current_profit)
````
to achieve it
But I'm not quite confident, if the bot can handle stuff smaller than `-1`, since `1` and `-1` seem to have some special meaning and are often used to disable stoploss etc.
2021-02-27 23:28:26 +01:00
Matthias
d9d5617432
UPdate backtesting doc for total profit calc
2021-02-27 20:26:13 +01:00
Matthias
6018a05343
Improve backtest documentation
2021-02-27 10:45:22 +01:00
Matthias
f5bb5f56f1
Update documentation with backtesting compounding possibilities
2021-02-27 09:33:00 +01:00
Matthias
d3fb473e57
Improve backtesting documentation
2021-02-27 09:33:00 +01:00
Matthias
f04f07299c
Improve backtesting metrics
2021-02-27 09:33:00 +01:00
Matthias
72f21fc5ec
Add trade-volume metric
2021-02-27 09:32:59 +01:00
Matthias
35e6a9ab3a
Backtest-reports should calculate total gains based on starting capital
2021-02-27 09:32:59 +01:00
Matthias
959ff99046
Add Dry-run wallet CLI option
2021-02-27 09:32:59 +01:00
Matthias
20455de2a9
Small enhancements to docs
2021-02-27 09:32:59 +01:00
Matthias
9968e4e49c
Add warning about downloading data from kraken
...
closes #4449
2021-02-27 08:26:13 +01:00
Matthias
0bb80d1442
Merge pull request #4446 from Xanders/patch-1
...
Webhook JSON format
2021-02-26 20:03:07 +01:00
Matthias
7d87c44c35
Merge pull request #4436 from Th0masL/forcesell_type
...
Allow changing the order_type for forcesell
2021-02-26 19:42:00 +01:00
Xanders
f0391d3761
Better JSON webhook result description
2021-02-26 21:40:45 +03:00
Xanders
984e70d4e8
Add webhook result example to documentation
2021-02-26 21:15:40 +03:00
Xanders
a2cd3ed5ba
Add documentation for JSON webhook format
2021-02-26 17:59:38 +03:00
Marco Seguri
51d73a5889
Fix #4441
2021-02-26 11:11:27 +01:00
Matthias
1b3b389109
Remove binanceje, add ftx to config selector
...
closes #4441
2021-02-26 07:58:15 +01:00
Matthias
c4979fd87f
Add note to check configuration settings to docker quickstart
...
part of #4441
2021-02-26 06:57:51 +01:00
Matthias
6d38a2e659
Small enhancements to docs
2021-02-25 19:57:09 +01:00
Th0masL
117f0064ed
Allow changing the order_type for forcesell
2021-02-25 05:02:08 +02:00
Matthias
1f30c3d7f1
Refresh slack link
2021-02-24 06:46:32 +01:00
Matthias
d6d8678fd6
Fix missleading FAQ information
2021-02-24 06:34:10 +01:00
Matthias
c71ecd3680
Fix wrong pair-content in strategy-analysis notebook and documentation
...
closes #4399
2021-02-22 20:04:36 +01:00
Alberto del Barrio
188d7aaf8c
Fix example in storing-information docs
2021-02-21 18:50:11 +01:00
Matthias
3629892fc3
Stoploss-guard should use the trade_limit or more
...
fix #4404
2021-02-20 19:38:44 +01:00
Matthias
4e5f8478b1
Merge pull request #4394 from JoeSchr/develop
...
fix(doc/plotting): misplaced comma in example code
2021-02-18 17:43:53 +01:00
JoeSchr
c9688f1c89
fix(doc/plotting): misplaced comma in example code
2021-02-18 17:30:29 +01:00
Matthias
327c23618f
Improve documentation for get_analyzed_dataframe
2021-02-18 09:30:35 +01:00
Matthias
11b20d6932
Add config to hyperopt_loss_function documentation
2021-02-17 07:04:29 +01:00
Matthias
009a447d8a
Adjust documentation for new parameter in loss functions
2021-02-16 19:51:09 +01:00
Matthias
10a11bda34
Document bitvavo as community tested
...
closes #4360
2021-02-14 09:42:25 +01:00
dependabot[bot]
22d447b3f5
Bump mkdocs-material from 6.2.7 to 6.2.8
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 6.2.7 to 6.2.8.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/docs/changelog.md )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/6.2.7...6.2.8 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-02-08 05:27:46 +00:00
Matthias
f6cdc6d9a2
Merge pull request #4325 from freqtrade/refresh_order_skip
...
Refresh order skip
2021-02-07 08:23:22 +01:00
Matthias
aec22c5c3d
introduce skip_open_order_update parameter
...
skips startup-open-order-update
closes #4128
2021-02-05 20:17:53 +01:00
Matthias
86a97988c0
Improve wording
2021-02-05 20:09:13 +01:00
JoeSchr
428d2af312
add sudo
to chown
...
that was the whole point d'oh
2021-02-04 19:39:25 +01:00
JoeSchr
5165357f40
Update data-download.md
...
Fix wrong path
Add section about fixing wrong docker permission, if user_data is created by docker, it's permission are set to `root`
2021-02-04 19:36:04 +01:00
Matthias
024849d844
Merge pull request #4285 from freqtrade/ui_deploy
...
Deploy FreqUI into webserver
2021-02-03 20:09:31 +01:00
Alberto del Barrio
f36c61e32f
Fix documentation links pointing to pairlists
2021-02-03 18:12:48 +01:00
Matthias
43986d3f73
Move Pricing to subpage
2021-02-02 20:26:01 +01:00
Matthias
b41078cc46
Don't include plugin documentation in Configuration page
2021-02-02 20:23:30 +01:00
Matthias
dabe456d65
Improve wording of configuration doc
...
remove unneeded sections
2021-02-02 20:20:34 +01:00
Matthias
3e3c9e99c7
Move command references to their respective subpages
2021-02-02 20:03:28 +01:00
Matthias
f0532f28cf
Small doc-reorg adding "advanced topics" as main header
2021-02-02 20:03:01 +01:00
Matthias
a9f1c871dd
Add path loading snippet to derived strategies
...
closes #4279
2021-02-01 19:48:29 +01:00
dependabot[bot]
7fcf0d5231
Bump pymdown-extensions from 8.1 to 8.1.1
...
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions ) from 8.1 to 8.1.1.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases )
- [Commits](https://github.com/facelessuser/pymdown-extensions/compare/8.1...8.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-02-01 08:45:31 +00:00
dependabot[bot]
2a5e0920ec
Bump mkdocs-material from 6.2.5 to 6.2.7
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 6.2.5 to 6.2.7.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/docs/changelog.md )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/6.2.5...6.2.7 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-02-01 05:42:08 +00:00
Matthias
35c2e2556e
Document FreqUI usage
2021-01-31 14:50:54 +01:00
Matthias
16dad8b6d4
Allow custom_stoploss to cooperate with stoploss on exchange
2021-01-30 20:11:18 +01:00
Matthias
30e5c01cb1
Improve formatting of custom_stoploss docs
2021-01-30 19:59:14 +01:00
Matthias
1e6194fa30
Improve wording, fix hirerchial hierarchy
2021-01-29 19:46:45 +01:00
Matthias
d8353bc90e
Merge branch 'develop' into pr/sobeit2020/4218
2021-01-29 19:11:19 +01:00