WWW_cool 444807c102 Merge remote-tracking branch 'origin/master' into fistful_master ... # Conflicts: # apps/ff_cth/src/ct_helper.erl # apps/ff_server/src/ff_p2p_template_codec.erl # apps/ff_server/src/ff_p2p_template_handler.erl # apps/ff_server/src/ff_p2p_transfer_codec.erl # apps/ff_server/test/ff_p2p_transfer_handler_SUITE.erl # apps/fistful/src/ff_party.erl # apps/p2p/src/p2p_template_machine.erl # apps/wapi/src/wapi_p2p_quote.erl # apps/wapi/src/wapi_p2p_template_backend.erl # apps/wapi/src/wapi_wallet_ff_backend.erl # apps/wapi/src/wapi_wallet_thrift_handler.erl # apps/wapi/test/wapi_p2p_template_tests_SUITE.erl # apps/wapi/test/wapi_thrift_SUITE.erl		2020-10-07 13:45:17 +03:00
..
wapi	Merge remote-tracking branch 'origin/master' into fistful_master	2020-10-07 13:45:17 +03:00
wapi_core/src	added requested changes	2020-09-17 17:09:54 +03:00
wapi_woody_client/src	FF-218: p2p transfer via thrift (#301)	2020-10-06 11:43:28 +03:00