exchange: master b6543b8f

Diff Back to Repository
Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2020-01-19 18:04 master fc8bdb9b
Changeset fix merge conflict
mod - src/auditor/generate-auditor-basedb.conf Diff File
mod - src/auditor/taler-wire-auditor.c Diff File
mod - src/auditor/test-auditor.conf Diff File
mod - src/bank-lib/taler-bank-transfer.c Diff File
mod - src/benchmark/benchmark.conf Diff File
mod - src/benchmark/taler-exchange-benchmark.c Diff File
mod - src/exchange-tools/taler-exchange-wire.c Diff File
mod - src/exchange/taler-exchange-httpd_validation.c Diff File
mod - src/exchange/test_taler_exchange_httpd.conf Diff File
mod - src/exchangedb/exchangedb_accounts.c Diff File
mod - src/exchangedb/test_exchangedb.c Diff File
mod - src/include/taler_crypto_lib.h Diff File
mod - src/include/taler_exchange_service.h Diff File
mod - src/include/taler_exchangedb_lib.h Diff File
mod - src/include/taler_json_lib.h Diff File
mod - src/include/taler_util.h Diff File
mod - src/json/json_wire.c Diff File
mod - src/lib/exchange_api_handle.c Diff File
mod - src/lib/exchange_api_wire.c Diff File
mod - src/testing/test-taler-exchange-aggregator-postgres.conf Diff File
mod - src/testing/test-taler-exchange-wirewatch-postgres.conf Diff File
mod - src/testing/test_auditor_api.conf Diff File
mod - src/testing/test_bank_api_fakebank.conf Diff File
mod - src/testing/test_bank_api_fakebank_twisted.conf Diff File
mod - src/testing/test_bank_api_pybank.conf Diff File
mod - src/testing/test_bank_api_pybank_twisted.conf Diff File
mod - src/testing/test_exchange_api.conf Diff File
rm - src/testing/test_exchange_api_home/.config/taler/account-1.json Diff File
mod - src/testing/test_exchange_api_home/.config/taler/account-2.json Diff File
rm - src/testing/test_exchange_api_home/.config/taler/test.json Diff File
rm - src/testing/test_exchange_api_home/.config/taler/x-taler-bank.json Diff File
mod - src/testing/test_exchange_api_keys_cherry_picking.conf Diff File
mod - src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json Diff File
mod - src/testing/test_exchange_api_twisted.conf Diff File
mod - src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json Diff File
mod - src/testing/testing_api_cmd_insert_deposit.c Diff File
mod - src/testing/testing_api_cmd_wire.c Diff File
mod - src/testing/testing_api_helpers_bank.c Diff File
mod - src/util/crypto_wire.c Diff File
mod - src/util/util.c Diff File