Commit Graph

2628 Commits

Author SHA1 Message Date
Matthias
22cda87211 Update some tests after merge 2021-12-02 19:05:06 +01:00
Matthias
f4d0abc51a Merge branch 'feat/short' into pr/samgermain/5780 2021-12-02 07:09:37 +01:00
Matthias
f71b7a4e76 Merge branch 'develop' into feat/short 2021-12-02 06:53:15 +01:00
Matthias
5ce1eeecf5 Reorder messages to be sent in correct order
buy first, then buy fill,
sell first, then sell fill.
2021-12-01 19:57:24 +01:00
Matthias
77443d5abc
Merge pull request #6011 from freqtrade/lev/backtesting
correctly apply leverage to backtesting
2021-12-01 19:49:40 +01:00
Matthias
67f3570bf3 Merge branch 'develop' into feat/short 2021-12-01 07:21:36 +01:00
Matthias
8b2fbb6432 Add leveraged backtest detail test 2021-11-30 20:42:18 +01:00
Matthias
231b1e2f57 Improve Async error message content 2021-11-30 07:10:12 +01:00
Matthias
de7e1e6bf7
Merge pull request #5980 from incrementby1/ShuffleFilterDetectLiveMode
Shuffle filter use seed only in backtesting mode
2021-11-30 06:37:35 +01:00
Matthias
dfb148f8d7 Fix formatting 2021-11-29 19:54:54 +01:00
Matthias
134b129d9d get_analyzed_df does not need a "candle_type" argument 2021-11-28 19:14:58 +01:00
Matthias
c20157e64f Add compatibility code for existing informative_pairs implementation 2021-11-28 15:43:04 +01:00
Matthias
0d6c933935 Improve and fix pair detection from available data 2021-11-28 15:25:57 +01:00
Matthias
0d1324718c Don't replace "-" when writing pair files 2021-11-28 15:08:02 +01:00
Matthias
7faa7539b4 Further enhance pair retrieval 2021-11-28 15:03:55 +01:00
Matthias
8d70672bee Enhance Regex to work for mark candles 2021-11-28 14:37:54 +01:00
Matthias
c096c7f5cb Add explicit tests for ohlcv regex 2021-11-28 14:34:46 +01:00
Spat
fb6ae174b9 Added raw config and retry config to webhook 2021-11-28 11:42:57 +11:00
Matthias
2b3e7eeb21 Use Enum values within bot code 2021-11-27 19:41:36 +01:00
Matthias
409a801763 Fix caching problem in refresh_ohlcv
closes #5978
2021-11-27 19:31:39 +01:00
Matthias
cb95b362ec
Merge pull request #5976 from freqtrade/forcebuy
allow force options with ordertype
2021-11-27 17:01:18 +01:00
Matthias
504efbd6d4 Add futures argument to download-data command 2021-11-27 16:36:59 +01:00
Matthias
a629777890 Improve test coverage in telegram module 2021-11-27 09:53:05 +01:00
Sam Germain
0183e313ac Merge branch 'mark-price-candles' of https://github.com/samgermain/freqtrade into mark-price-candles 2021-11-27 02:44:14 -06:00
Sam Germain
0d30b32fdd Formatting changes 2021-11-27 02:44:06 -06:00
Matthias
450293878f
Merge pull request #5964 from stash86/fix-docs
Add more words on VolumePairlist backtest error message
2021-11-26 07:48:24 +01:00
Matthias
897788de17 Reformulate exception to be "nicer" 2021-11-26 07:02:50 +01:00
Matthias
cc9ea1d466
Merge pull request #5935 from freqtrade/short_buy_tag_compat
Short buy tag compat
2021-11-26 06:29:56 +01:00
Stefano Ariestasia
5307d2bf3b Trimming the sentence 2021-11-25 17:04:04 +09:00
Stefano Ariestasia
c23d90e2b8 Update test_backtesting.py 2021-11-25 16:56:56 +09:00
Stefano Ariestasia
0c629fc951 Update test_backtesting.py 2021-11-25 16:03:29 +09:00
Matthias
338fe333a9 Allow forcebuy to specify order_type 2021-11-24 20:20:58 +01:00
Matthias
65906d330f Improve tests for pair_to_filename 2021-11-23 20:07:54 +01:00
Matthias
e8feac3674 Improve tests for pair_to_filename 2021-11-23 20:02:07 +01:00
Matthias
51e54a666c Merge branch 'feat/short' into pr/samgermain/5780 2021-11-23 19:01:07 +01:00
Matthias
db16098981 Fix Tests 2021-11-23 17:43:37 +01:00
Sam Germain
586ca3b2fa removed is_market_future from binance and ftx 2021-11-23 11:09:31 +01:00
Matthias
ce0593c0e1 Merge branch 'develop' into feat/short 2021-11-23 07:35:26 +01:00
Matthias
b8cefd687e Add api_version to botresponse 2021-11-23 07:08:55 +01:00
Rokas Kupstys
78a00f2518 Use market data to get base and quote currencies in @informative() decorator. 2021-11-22 09:27:45 +02:00
Matthias
64e34f382e Sell-fill should include open-rate 2021-11-22 07:13:22 +01:00
Sam Germain
920151934a Added candle_type to a lot of methods, wrote some tests 2021-11-21 17:48:14 -06:00
Sam Germain
64a6abc541 Added candle type to ohlcv_get_available_data 2021-11-21 17:48:14 -06:00
Sam Germain
c3b2929e75 Added template for test test_hdf5datahandler_ohlcv_load_and_resave 2021-11-21 17:48:14 -06:00
Sam Germain
843ca22a56 mark price test ohlcv_get_pairs 2021-11-21 17:48:14 -06:00
Sam Germain
91a11d01e9 Added XRP_USDT-1h-mark json testdat file, and test for ohlcv_load with candle_type=mark 2021-11-21 17:48:14 -06:00
Sam Germain
043ed3e330 Added candle_type tests for test_json_pair_data_filename 2021-11-21 17:48:14 -06:00
Sam Germain
ee2ad8ca97 updated historic data filenames to include the candle type 2021-11-21 17:48:14 -06:00
Sam Germain
c8162479d6 Added price as param to fetch_ohlcv 2021-11-21 17:48:14 -06:00
Matthias
c26c0b6822 Merge branch 'feat/short' into short_buy_tag_compat 2021-11-21 19:31:59 +01:00
Matthias
aad37bb8f3
Merge pull request #5924 from freqtrade/feat/leverage
call leverage methods
2021-11-21 19:30:27 +01:00
Matthias
983484accd Remove fluky test (seconds still tick with time_machine) 2021-11-21 10:36:39 +01:00
Matthias
2a84526f04 Remove more buy_tag references 2021-11-21 10:05:56 +01:00
Matthias
36deced00b Remove more buy_tag references 2021-11-21 09:55:10 +01:00
Matthias
7d77aff289 Add some compatibility around buy_tag 2021-11-21 09:24:20 +01:00
Matthias
7a8978abbb Make ohlcv data endpoint work correctly with new interface 2021-11-20 20:09:37 +01:00
Matthias
988f4d5190 Test leverage call in freqtradebot 2021-11-19 19:34:59 +01:00
Matthias
0a50017c84 Add long/short support to backtesting 2021-11-18 20:34:59 +01:00
Matthias
f40221dd9f Merge branch 'develop' into feat/short 2021-11-18 20:20:01 +01:00
Matthias
4f0a73010a
Merge pull request #5890 from aezomz/todo-rpc
Todo-lev RPC tests and model
2021-11-17 06:58:07 +01:00
aezo.teo
1ba2e275b8 updated test param format 2021-11-16 14:29:40 +08:00
Matthias
ce3c5b32f9 Fix test leakage in ccxt_compat 2021-11-16 07:04:56 +01:00
aezo.teo
c17c1611bd removed short_trades, updated schema, tests 2021-11-16 14:03:33 +08:00
Matthias
75eccea88d Improve futures detection, add ccxt-compat test 2021-11-15 19:57:36 +01:00
Matthias
4e9b83e170 Merge branch 'feat/short' into futures_pairlist 2021-11-15 19:12:36 +01:00
Matthias
60cf52aa34 Remove unused test code 2021-11-15 07:10:58 +01:00
Sam Germain
ff6b1f4421 Small changes 2021-11-14 21:01:08 -06:00
Sam Germain
f101419a47 Merge branch 'feat/short' into todo-rpc 2021-11-14 20:48:55 -06:00
Matthias
e7499b7c44 Improve leggibility of test 2021-11-14 19:53:08 +01:00
Matthias
9102590365 Improve tests by also having a "Mixed" case 2021-11-14 19:22:12 +01:00
aezo.teo
a08572e907 Merge remote-tracking branch 'upstream/feat/short' into todo-rpc 2021-11-14 21:21:59 +08:00
aezo.teo
22f7c0fdc6 updated test cases 2021-11-14 21:04:24 +08:00
Matthias
b3afca2a9d Improve ccxt_compat test for funding rate 2021-11-14 13:37:09 +01:00
aezo.teo
92997c85f9 adding sides for rate and 1 more test case 2021-11-14 17:37:31 +08:00
Matthias
4d1d8de9b7 Split /stats messages
closes #5869
2021-11-14 10:20:04 +01:00
Sam Germain
e7fad04eb9 Merge branch 'feat/short' into funding-fee-dry-run 2021-11-14 03:15:22 -06:00
Matthias
1dc98cc4d5 Break line 2021-11-14 10:12:19 +01:00
aezo.teo
8df334515f added logic for is_short and tests 2021-11-14 16:52:38 +08:00
Matthias
8cfc531b32
Merge pull request #5887 from samgermain/common-ccxt-config
Common ccxt config
2021-11-14 09:52:06 +01:00
Matthias
5b9cbaf277 Use Close value for trade signal calculation 2021-11-14 09:50:04 +01:00
Matthias
38362e0ec5 Update test names 2021-11-14 09:02:25 +01:00
Sam Germain
86e5b480a8 test_strategy_test_v2 for shorts 2021-11-13 19:56:29 -06:00
Sam Germain
430aa0903f Removed redundent TODO-levs 2021-11-13 19:45:41 -06:00
Sam Germain
77f8f8658c test_rpc_telegram short test 2021-11-13 19:36:49 -06:00
Sam Germain
ca9805112d test_get_trades_proxy and test_select_order for shorts passes 2021-11-13 19:28:58 -06:00
Sam Germain
01ad65de68 test_rpc_apiserver.py 2021-11-13 19:22:43 -06:00
Sam Germain
3ce64dd4e9 Added test__ccxt_config for all exchanges with subclass files on freqtrade 2021-11-13 16:32:43 -06:00
Sam Germain
099bf7691e Updated bibox to combine parent _ccxt_config and minimized _ccxt_config tests 2021-11-13 16:23:59 -06:00
Sam Germain
3d86b18492 Added property _ft_has_default.ccxt_futures_name and removed subclass ccxt_config properties 2021-11-13 16:23:58 -06:00
ethan
a177e58dc4 Remove "currency" generating from splitting pair str 2021-11-13 08:49:02 -05:00
Sam Germain
3c509a1f9b New method for combining all funding fees within a time period 2021-11-13 04:45:23 -06:00
ethan
32e3376296 Update buy/sell fill telegram notifications 2021-11-12 21:49:07 -05:00
Matthias
6b40792f80
Merge branch 'feat/short' into funding-fee-dry-run 2021-11-12 08:06:29 +01:00
Matthias
8d4163d003 Add compat tests 2021-11-12 07:26:59 +01:00
Matthias
68083b7fdd Fix sqlinsert failure in test 2021-11-11 20:07:56 +01:00
Matthias
4d1ce51207
Merge pull request #5879 from freqtrade/improve_pct_formatting
Improve pct formatting
2021-11-11 19:30:55 +01:00
Matthias
39bb34cdb3 Fix test loading bug 2021-11-11 16:34:40 +01:00
Matthias
e0fd880c11 Improve some more pct formattings 2021-11-11 16:12:23 +01:00
Matthias
4eb9038358 Some more fixes to % formatting 2021-11-11 15:06:16 +01:00
Matthias
1b271d0840 Improve % outputs to not use explicit "pct" entries 2021-11-11 12:58:38 +01:00
Matthias
ce2aa1dc69 Small formatting upgrades 2021-11-11 12:06:18 +01:00
Matthias
f8d30abd79 Handle order returns that contain trades directly
binance market orders - and potentially other exchanges
2021-11-10 19:43:36 +01:00
Matthias
f7b2c0c5d7 Remove unneeded assignment from tests 2021-11-10 19:16:37 +01:00
Matthias
e7d1630c92 Add space 2021-11-10 16:51:31 +01:00
Sam Germain
43174760ef Added exit trade funding_fees check but test fails because of sql integrity error test_update_funding_fees 2021-11-10 01:19:51 -06:00
Sam Germain
b87f8e7034 Removed unnecessary todo comments 2021-11-10 00:59:53 -06:00
Matthias
d3d17f9f8b Only allow min-stake adjustments of up to 30%
fix #5856
2021-11-10 06:57:22 +01:00
Matthias
23a566b478 validate_stake_amount should not be a private method 2021-11-10 06:38:24 +01:00
Matthias
6267678ca9 Use doublequotes for docstrings 2021-11-09 10:40:01 +00:00
Sam Germain
6c8501dadc Removed docstring indents 2021-11-09 01:00:57 -06:00
Matthias
2bfec7d549 Add small test-case confirming trade object copy 2021-11-08 20:14:32 +01:00
Sam Germain
7122cb2fe9 updated test_get_funding_fees to test for funding fees at beginning of trade also 2021-11-08 01:58:23 -06:00
Sam Germain
bea37e5ea3 moved dry run check for funding fees to exchange 2021-11-08 01:58:09 -06:00
Matthias
de4bc7204d Update documentation to clarify new behaviour 2021-11-07 15:36:43 +01:00
Matthias
a08dd17bc1 Use startup_candle-count to determine call count 2021-11-07 13:10:40 +01:00
Matthias
9fa64c2647 Allow multiple calls to get more candles in live-run 2021-11-07 11:31:59 +01:00
Matthias
11b77cf94c Update test to new list-pairs format 2021-11-07 10:43:00 +01:00
Matthias
bfe3760f68 Add tests for margin mode 2021-11-07 10:43:00 +01:00
Matthias
0dd9a277d3 improve market_is_tradable tests 2021-11-07 10:43:00 +01:00
Matthias
534b0a5911 Some tests for new market checking 2021-11-07 10:43:00 +01:00
Matthias
8990097d6f Enrich markets mock with "type" and "spot" info 2021-11-07 10:43:00 +01:00
Sam Germain
252e45ebf2 Merge branch 'feat/short' into funding-fee-dry-run 2021-11-06 22:46:00 -06:00
Sam Germain
8bfcf4ee09 Fixed breaking exchange tests from _get_funding_fee_dates, and commented out kraken get_funding_fees tests 2021-11-06 22:05:38 -06:00
Sam Germain
b88482b2e9 Fixed millisecond timestamp issue errors with funding fees 2021-11-06 21:45:35 -06:00
Sam Germain
48b34c8fd0 Fixed issues with funding-fee being miscalculated on trade objects in freqtradebot 2021-11-06 21:03:18 -06:00
Sam Germain
f795288d90 Fixed timestamp/datetime issues for mark price, funding rate and _get_funding_fee_dates 2021-11-06 20:48:03 -06:00
Sam Germain
6e912c1053 Updated _get_funding_fee method names, added kraken._get_funding_fee 2021-11-06 17:39:21 -06:00
Matthias
25fcab0794 Enhance /show_config endpoint 2021-11-06 16:20:18 +01:00
Matthias
fef7da03b2
Merge pull request #5850 from freqtrade/timeout_forcesell
multiple exit-timeouts can trigger emergencysell
2021-11-06 16:20:06 +01:00
Matthias
ebc38159b8 Merge branch 'develop' into feat/short 2021-11-06 15:24:52 +01:00
Matthias
f7dc47b1c8 Add test for exit_timeout_count 2021-11-06 13:10:41 +01:00
Sam Germain
cb97c6f388 Updated time to utc in test_update_funding_fees, some funding rate key errors because a timestamp is likely not in utc 2021-11-06 05:56:58 -06:00
Sam Germain
fd63fa7dda Updated test_update_funding_fees to compile fine but the assertion is incorrect 2021-11-06 05:42:41 -06:00
Rokas Kupstys
98b475a00b Use lambdas instead of a static number of side-effects. 2021-11-06 10:23:46 +02:00
Antoine Merino
70253258f0
Test /monthly & clean
Signed-off-by: Antoine Merino <antoine.merino.dev@gmail.com>
2021-11-05 22:33:06 +01:00
Antoine Merino
459ff9692d
Add /weekly and /monthly to Telegram RPC
/weekly now list weeks starting from monday instead of rolling weeks.
/monthly now list months starting from the 1st.

Signed-off-by: Antoine Merino <antoine.merino.dev@gmail.com>
2021-11-05 21:07:28 +01:00
Antoine Merino
5f40158c0b
WIP Add /weekly and /monthly to Telegram RPC
Related to "Show average profit in overview" (#5527)

Signed-off-by: Antoine Merino <antoine.merino.dev@gmail.com>
2021-11-05 21:07:19 +01:00
Matthias
ae3b53014d Add failing test for OKEX failure
part of #5842
2021-11-05 19:44:02 +01:00
Matthias
60a5ded532 Don't convert telegram chat_id
closes #5840
2021-11-05 19:27:54 +01:00
Sam Germain
8a4236198f Added test_update_funding_fees in freqtradebot, test currently fails 2021-11-03 22:52:37 -06:00
Matthias
431b96de98 Merge branch 'develop' into pr/theluxaz/5710 2021-11-03 19:43:36 +01:00
Matthias
161a3fac15 Run exchange-enabled tests against okex 2021-11-02 20:08:56 +01:00
Sam Germain
3de42da29a All funding fee test_exchange tests pass 2021-11-01 07:52:40 -06:00
Sam Germain
863e0bf837 Adding 1am tests to funding_fee_dates 2021-11-01 06:40:20 -06:00
Sam Germain
74b6335acf Adding timezone utc to test__get_funding_fee_dates 2021-11-01 06:34:22 -06:00
Sam Germain
ba95172d07 Finished test_calculate_funding_fees 2021-11-01 06:28:03 -06:00
Sam Germain
765ee5af50 Updated conftest funding_rate and mark_price 2021-11-01 02:51:59 -06:00
Matthias
4249fcefba
Merge pull request #5150 from cryptomeisternox/backtesting-filter
Adding command for Filtering and print trades
2021-11-01 09:43:49 +01:00
Sam Germain
8b9dfafdf4 Tests for _get_funding_fee_dates 2021-11-01 01:09:57 -06:00
Sam Germain
77d247e179 Created fixtures mark_ohlcv and funding_rate_history 2021-11-01 01:04:42 -06:00
Sam Germain
5c52b21346 Added tests for funding_fee_dry_run 2021-10-31 22:24:27 -06:00
Matthias
6b90b4a144 Test "get-signal" 2021-10-31 10:53:30 +01:00
Matthias
dffe76f109 Don't double-loop to generate profits 2021-10-31 10:49:56 +01:00
Matthias
c15f73aa1f Rename command to backtesting-show 2021-10-31 10:13:11 +01:00
Matthias
c094ac5762 Merge branch 'develop' into feat/short 2021-10-30 19:45:19 +02:00
Matthias
20904f1ca4 Add tests for new command 2021-10-30 19:43:42 +02:00
Matthias
72ecb45d86 Add test for backtest_show logic 2021-10-30 16:53:48 +02:00
Matthias
459a2239ce Fix candle ranges in backtesting test 2021-10-30 16:13:04 +02:00
Matthias
6cf140f8fb FIx testcases 2021-10-30 16:07:10 +02:00
Matthias
c34b8a95d7
Merge pull request #5798 from incrementby1/personal-branch
Add function to unlock PairLocks by reason
2021-10-30 10:15:21 +02:00
Matthias
c579fcfc19 Add tests and documentation for unlock_reason 2021-10-30 09:51:09 +02:00
Matthias
201fe108bc
Merge pull request #5607 from TreborNamor/develop
a new hyperopt loss created that uses calmar ratio
2021-10-29 09:20:44 +02:00
Matthias
240923341b Reformat telegram test 2021-10-29 07:05:02 +02:00
Matthias
5cdae2ce3f Remove CalmarDaily hyperopt loss 2021-10-29 06:53:40 +02:00
theluxaz
560802c326 Added tests for the new rpc/telegram functions 2021-10-28 21:39:42 +03:00
theluxaz
21ab83163d Quick import/clarity fix 2021-10-27 01:35:47 +03:00
theluxaz
e4e75d4861 Added test data for buy_tag/sell_reason testing 2021-10-27 01:29:19 +03:00
Sam Germain
a2b1838c60 Merge branch 'feat/short' into funding-fee-dry-run 2021-10-25 22:00:09 -06:00
theluxaz
b51f946ee0 Fixed models and rpc performance functions, added skeletons for tests. 2021-10-25 23:43:22 +03:00
Simon Ebner
f7926083ca Clean up unclosed file handles
Close all file handles that are left dangling to avoid warnings such as

```
ResourceWarning: unclosed file <_io.TextIOWrapper
name='...' mode='r' encoding='UTF-8'> params = json_load(filename.open('r'))
```
2021-10-24 23:15:05 +02:00
Matthias
5f309627ea Update tests for Calmar ratio 2021-10-24 09:01:13 +02:00
Sam Germain
60478cb213 Add fill_leverage_brackets and get_max_leverage back in 2021-10-23 22:16:51 -06:00
Sam Germain
ef8b617eb2 gateio, ftx and binance all use same funding fee formula 2021-10-23 21:59:03 -06:00
Sam Germain
2a26c6fbed Added backtesting methods back in 2021-10-23 21:33:37 -06:00
Sam Germain
ed91516f90 Changed future to swap 2021-10-23 14:10:09 -06:00
Sam Germain
1fa2600ee2 Added gateio to test__ccxt_config 2021-10-22 11:52:05 -06:00
Sam Germain
167f9aa8d9 Added gateio futures support, and added gatio to test_exchange exchanges variable 2021-10-22 11:52:05 -06:00
Sam Germain
aed22f7dad Merge branch 'develop' into feat/short 2021-10-22 11:45:27 -06:00
Matthias
21141bdcb3
Merge pull request #5732 from samgermain/new-max-lev
New max lev
2021-10-22 19:30:58 +02:00
Matthias
78724e304e Merge branch 'develop' into pr/theluxaz/5710 2021-10-21 17:46:39 +02:00
theluxaz
0e085298e9 Fixed test failures. 2021-10-21 17:25:38 +03: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
e458c9867a Styling fixes 2021-10-21 07:45:15 +02:00
Matthias
7b5346b984 Add test for breakdown-stats 2021-10-21 07:11:39 +02:00
Matthias
1267374c8a Small fixes to tests 2021-10-20 19:21:38 +02:00
Matthias
028e5de935 Remove space after @ decorator in tests 2021-10-20 16:53:24 +02:00
Sam Germain
0329da1a57 updated get_max_leverage to use new ccxt unified property 2021-10-20 08:36:48 -06:00
Sam Germain
3fffc315ac Merge branch 'develop' into feat/short 2021-10-20 08:11:53 -06:00
Matthias
79a91dc31b
Merge pull request #5567 from samgermain/lev-freqtradebot
Lev freqtradebot
2021-10-20 15:48:07 +02:00
Matthias
dd59b23b49
Merge pull request #5763 from samgermain/test-ccxt-config
Test ccxt config
2021-10-20 15:41:26 +02:00
Sam Germain
8c80fb46c8 test__ccxt_config 2021-10-20 05:33:09 -06:00
Matthias
55b0216180 Allow StaticPairlist in non-first position
closes #5754
2021-10-19 19:48:56 +02:00
Sam Germain
57d7009fd9 Added trading mode and collateral to constants.py 2021-10-18 01:21:41 -06:00
Sam Germain
e4682b78c5 updates suggested on github 2021-10-18 00:28:32 -06:00
Matthias
ad2c88b991 Reduce test-code duplication by importing functions 2021-10-17 17:00:25 +02:00
Matthias
d4d57f0002 Document expansion of --pairs, add download-inactive 2021-10-17 16:09:56 +02:00
Matthias
9bb2dd1851
Merge pull request #5694 from freqtrade/dependabot/pip/develop/fastapi-0.70.0
Bump fastapi from 0.68.1 to 0.70.0
2021-10-17 15:01:28 +02:00
Matthias
e8f98e473d Fix a few more tests 2021-10-17 11:08:54 +02:00
Matthias
198f3c5238 Merge branch 'feat/short' into pr/samgermain/5567 2021-10-17 10:41:03 +02:00
Matthias
69fdb8edfa Merge branch 'develop' into feat/short 2021-10-17 10:40:08 +02:00