Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
A botched merge modified an old migration file, causing the current
merchant to migrate the DB cleanly from old databases.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
frontend to detect that it must use PATCH
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# src/backend/taler-merchant-httpd_private-post-orders.c
# src/backenddb/Makefile.am
# src/backenddb/merchant-0006.sql
# src/backenddb/pg_insert_token_family_key.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|