Source Control Integration

master 87f85795 2016-04-17 14:30 Christian Grothoff Details Diff	fix assert on exit if there are no auditors
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd_auditors.c	Diff File
master cdd1091b 2016-04-17 14:22 Christian Grothoff Details Diff	Merge branch 'master' of ssh://taler.net:/var/git/merchant
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 135a9a2f 2016-04-17 14:22 Christian Grothoff Details Diff	fix linker flag
	mod - copylib/config.php	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
	mod - src/backenddb/Makefile.am	Diff File
master 38c85d80 2016-04-17 00:54 Christian Grothoff Details Diff	better error reporting on config trouble
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master c6bf4574 2016-04-10 03:13 Christian Grothoff Details Diff	Merge branch 'master' of git+ssh://taler.net/var/git/merchant
	mod - Makefile.am	Diff File
	mod - README	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master c0a8da8c 2016-04-10 02:58 Christian Grothoff Details Diff	changing code to meet latest change in GNUNET_SCHEDULER API
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master ce507d6e 2016-04-08 16:13 Christian Grothoff Details Diff	fix app target
	mod - Makefile.am	Diff File
master 6adc80f4 2016-04-08 12:48 Marcello Stanisci Details Diff	updating README as wanted by Laure
	mod - README	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master ddc5a9c6 2016-04-07 16:23 Florian Dold Details Diff	sync submodules
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master e2ecc9cd 2016-04-07 16:13 Marcello Stanisci Details Diff	adapting merchant.conf to what the wire-plugin likes
	mod - merchant.conf	Diff File
master 7f885d15 2016-04-07 15:50 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 0f273e00 2016-04-07 15:48 Florian Dold Details Diff	assertion
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master f0e4549b 2016-04-07 15:42 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/Makefile.am	Diff File
	add - src/backend/merchant.conf	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
master e326c548 2016-04-07 15:15 Christian Grothoff Details Diff	add config file
	add - src/backend/merchant.conf	Diff File
master db9a06b1 2016-04-07 15:14 Christian Grothoff Details Diff	syncsub
	mod - examples/blog/web-common	Diff File
master 041c0faf 2016-04-07 15:13 Christian Grothoff Details Diff	sync
	mod - examples/shop/web-common	Diff File
master 562483eb 2016-04-07 14:00 Florian Dold Details Diff	update submodules
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master e61803d1 2016-04-07 13:08 Christian Grothoff Details Diff	fixing 0004374
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/tests/merchant.conf	Diff File
master 28feb29d 2016-04-07 12:54 Christian Grothoff Details Diff	fxi 0004381
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/Makefile.am	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
master 5f1e6aa0 2016-04-07 12:32 Christian Grothoff Details Diff	Merge branch 'master' of git.taler.net:/var/git/merchant
	mod - examples/blog/essay_cc-form.html	Diff File
	mod - examples/blog/essay_fulfillment.php	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/fulfillment.php	Diff File
	mod - examples/shop/web-common	Diff File
master ab2268f1 2016-04-07 12:32 Christian Grothoff Details Diff	add timeout of 5s for requests
	mod - src/backend/taler-merchant-httpd.c	Diff File
master d3d5f0ff 2016-04-06 20:40 Marcello Stanisci Details Diff	removing old merchant.conf
	rm - src/tests/merchant.conf	Diff File
master ff70861f 2016-04-06 20:39 Marcello Stanisci Details Diff	tracking merchant.conf
	add - merchant.conf	Diff File
master 5c3623dc 2016-04-06 19:50 Florian Dold Details Diff	update submodules
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master 78524c0b 2016-04-06 19:43 Florian Dold Details Diff	update submodules
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File

Changesets: merchant