aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-09 17:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'source/master' into dev-lndrpc

Browse Source 
# Conflicts:
#	BTCPayServer.Tests/UnitTest1.cs
This commit is contained in:
rockstardev
2018-06-26 01:08:01 -05:00
parent 9a5259510b ac8feceaf2
commit 1784c30787
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BTCPayServer.Tests/docker-compose.yml
View File

@@ -111,7 +111,7 @@ services:
- "bitcoin_datadir:/data"
customer_lightningd:
image: nicolasdorier/clightning:0.0.0.21-dev
image: nicolasdorier/clightning:v0.6-dev
environment:
EXPOSE_TCP: "true"
LIGHTNINGD_OPT: |
@@ -134,7 +134,7 @@ services:
- bitcoind
lightning-charged:
image: shesek/lightning-charge:0.3.12
image: shesek/lightning-charge:0.3.15
environment:
NETWORK: regtest
API_TOKEN: foiewnccewuify
@@ -153,7 +153,7 @@ services:
- merchant_lightningd
merchant_lightningd:
image: nicolasdorier/clightning:0.0.0.21-dev
image: nicolasdorier/clightning:v0.6-dev
environment:
EXPOSE_TCP: "true"
LIGHTNINGD_OPT: |

2
BTCPayServer/BTCPayServer.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<Version>1.0.2.36</Version>
<Version>1.0.2.37</Version>
<NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
</PropertyGroup>
<ItemGroup>