Merge remote-tracking branch 'origin-pull/335/head'

luke-jr · luke-jr · commit f275a5549bbb · 2016-07-15T15:44:54.000Z
diff --git a/bip-0021.mediawiki b/bip-0021.mediawiki
@@ -124,3 +124,4 @@ Characters must be URI encoded properly.
 
 === Libraries ===
 * Javascript - https://github.com/bitcoinjs/bip21
+* [[BitcoinPaymentURI|https://github.com/SandroMachado/BitcoinPaymentURI]] Java library to process and generate Bitcoin payment URI's.

Original file line number	Diff line number	Diff line change
`@@ -124,3 +124,4 @@ Characters must be URI encoded properly.`
`124`	`124`
`125`	`125`	`=== Libraries ===`
`126`	`126`	`* Javascript - https://github.com/bitcoinjs/bip21`
	`127`	`+* [[BitcoinPaymentURI\|https://github.com/SandroMachado/BitcoinPaymentURI]] Java library to process and generate Bitcoin payment URI's.`