Skip to content

Commit

Permalink
Merge branch 'release/2022-11-25.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Beorn Bishop committed Nov 25, 2022
2 parents 09889bd + 9159fbf commit 9397e2a
Show file tree
Hide file tree
Showing 76 changed files with 13,078 additions and 71,140 deletions.
11 changes: 7 additions & 4 deletions .env.development.backend
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ DB_PASSWORD=example
DB_NAME=morpherwallet
DB_DIALECT=postgres
FACEBOOK_APP_ID=299132904630133
FACEBOOK_APP_SECRET=db3693734c6dd7c5581d5e1f012e3e84
GOOGLE_APP_ID=376509986959-k6tstmq30f4spbp9vd1u94tvt8dg714b.apps.googleusercontent.com
GOOGLE_APP_SECRET=Lf03bMX-jV5uP-USJ-J5QFkQ
FACEBOOK_APP_SECRET=
GOOGLE_APP_ID=
GOOGLE_ANDROID_APP_ID=
GOOGLE_IOS_APP_ID=
GOOGLE_WEB_APP_ID=
GOOGLE_APP_SECRET=
TWITTER_APP_ID=hCiGjX80GPANJIKKeE4cCSsyU
TWITTER_APP_SECRET=neGkY4nvHhzw8QBNXYQzB0zwXte6WNSzNMf1C6evSjuDXdYF6U
TWITTER_APP_SECRET=
VK_APP_ID=7734395
DB_BACKEND_SALT=kjdfkjdfkjdfkjdfkjdfkjdfkjdkfjdkkjdfkjdfkjdfkjdfkjdfkjdfkjdkfjdk

Expand Down
3 changes: 3 additions & 0 deletions backend-node/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ DB_PASSWORD=

FACEBOOK_APP_ID=
GOOGLE_APP_ID=
GOOGLE_ANDROID_APP_ID=
GOOGLE_IOS_APP_ID=
GOOGLE_WEB_APP_ID=
TWITTER_APP_ID=
VK_APP_ID=

Expand Down
Loading

0 comments on commit 9397e2a

Please sign in to comment.