mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-02-25 23:20:21 +01:00
Code Issues Projects Releases Wiki Activity
eclair/eclair-core/src
History
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
..
main Merge branch 'master' into extended-api-pm 2019-03-28 10:44:24 +01:00
test Merge branch 'master' into extended-api-pm 2019-03-28 10:44:24 +01:00