Andrea 8ec8574d97 Merge branch 'master' into extended-api-pm ... # Conflicts: # eclair-core/src/main/scala/fr/acinq/eclair/api/Service.scala # eclair-core/src/main/scala/fr/acinq/eclair/payment/PaymentEvents.scala # eclair-core/src/test/scala/fr/acinq/eclair/api/JsonSerializersSpec.scala		2019-03-28 10:44:24 +01:00
..
src	Merge branch 'master' into extended-api-pm	2019-03-28 10:44:24 +01:00
eclair-cli	API: use form data instead of JSON-RPC (#894)	2019-03-26 18:10:09 +01:00
pom.xml	Upgrade to bitcoin 0.17.1 (#826)	2019-03-19 14:57:03 +01:00