Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/com/linkode/api_server/config/WebSocketConfig.java
  • Loading branch information
Mouon committed Aug 29, 2024
2 parents 90c3c02 + a74acb4 commit 31f4ea9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/resources/static/test.html
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ <h3>Upload Events:</h3>
});

function loadInitialList(studyroomId, token) {
const url = `http://localhost:8080/studyroom/data/list?studyroomId=${studyroomId}&type=LINK`;
const url = `https://linkode.site/studyroom/data/list?studyroomId=${studyroomId}&type=LINK`;

fetch(url, {
method: 'GET',
Expand Down

0 comments on commit 31f4ea9

Please sign in to comment.