12 Commits

Author	SHA1	Message	Date
Kalle Rosenbaum	a429841781	Clarified that the PoP is sent as binary over http	2015-10-27 14:25:27 +01:00
Kalle Rosenbaum	05451a239e	Removed mapping of merchant_data to btcpop-label since merchant data is a byte-array, Thanks Andreas Schildbach. Instead map the memo field to btcpop-label and don't have any bip70 field mapped to btcpop-message.	2015-10-27 14:18:00 +01:00
Kalle Rosenbaum	0224692887	Merge remote-tracking branch 'upstream/master'	2015-10-22 09:20:34 +02:00
Jonathan Cross	61b865e524	Spelling fix. ... "unneccesarily" => "unnecessarily"	2015-10-20 15:38:14 +02:00
Kalle Rosenbaum	e313067d01	Removing unnecessary http header Content-Transfer-Encoding. That is only used for e-mail.	2015-09-25 14:36:45 +02:00
Kalle Rosenbaum	10173c76cc	Fixed unencoded space character in example	2015-09-17 15:10:27 +02:00
Kalle Rosenbaum	3d1eb28f84	Adding BIP0121	2015-08-07 19:06:18 +02:00
Kalle Rosenbaum	0cf2419511	Removing bips and will add them again one at a time.	2015-08-07 19:02:36 +02:00
Kalle Rosenbaum	8921a74d43	More formatting. Trying to get dummy URLs to not display as links.	2015-08-07 18:54:07 +02:00
Kalle Rosenbaum	e958c59d2a	Testing formatting	2015-08-07 18:41:19 +02:00
Kalle Rosenbaum	e0b32222d0	Fixing markup	2015-08-07 18:37:17 +02:00
Kalle Rosenbaum	4b6ee39ced	Added BIP0120 and BIP0121	2015-07-28 22:41:35 +02:00