Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into 517-suppress-neon-cli-stderr
# Conflicts:
#	proxy/environment.py
  • Loading branch information
rozhkovdmitrii committed Feb 3, 2022
commit 40da5d8fd4d508450528f666d530dec5b795de02
2 changes: 1 addition & 1 deletion proxy/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import subprocess
from logged_groups import logged_group, LogMng
from solana.publickey import PublicKey
from solana.account import Account as sol_Account
from solana.account import Account as SolanaAccount
from typing import Optional, List

SOLANA_URL = os.environ.get("SOLANA_URL", "http://localhost:8899")
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.