Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.yarnrc.yml
#	openremote
#	yarn.lock
  • Loading branch information
pankalog committed Jul 5, 2024
2 parents b51bb47 + 835af12 commit b0feed5
Show file tree
Hide file tree
Showing 5 changed files with 3,424 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
OR_HOSTNAME=localhost
OR_SSL_PORT=443
KC_HOSTNAME_PORT=-1
WEBSERVER_LISTEN_HOST=0.0.0.0
894 changes: 894 additions & 0 deletions .yarn/releases/yarn-4.3.1.cjs

Large diffs are not rendered by default.

Loading

0 comments on commit b0feed5

Please sign in to comment.