Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into soroban-transactions
Browse files Browse the repository at this point in the history
# Conflicts:
#	backend/internal/app/app.go
#	backend/internal/controller/http/v1/router.go
#	backend/main.go
  • Loading branch information
lucasmagnus committed Oct 23, 2023
2 parents f61e6e0 + 216968c commit b3f855b
Show file tree
Hide file tree
Showing 31 changed files with 1,738 additions and 44 deletions.
2 changes: 2 additions & 0 deletions backend/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ KAFKA_SCHEMA_REGISTRY_URL=
# HTTP
HTTP_PORT=
HTTP_FRONT_ADRESS=
HTTP_FRONT_ADRESS=
## JWT SECRET
JWT_SECRET_KEY=secret

Expand Down Expand Up @@ -61,3 +62,4 @@ PRINCIPALS_TWITTER=
PRINCIPALS_GITHUB=
PRINCIPALS_ID_PHOTO_HASH=
PRINCIPALS_VERIFICATION_PHOTO_HASH=

Loading

0 comments on commit b3f855b

Please sign in to comment.