Merge API branch into main #12

Merged
SemvdH merged 334 commits from api into main 2023-06-13 19:54:43 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit 133c2a04ab - Show all commits

View File

@@ -10,6 +10,7 @@ body {
.video {
width: 100%;
overflow: hidden;
}
.mainvideo {
@@ -21,7 +22,7 @@ body {
.lastpicture {
width: 40%;
float: right;
float: left;
height: 400px;
border: 1px solid red;
}

View File

@@ -17,7 +17,6 @@
<div class="lastpicture">
<img id="picture">
</div>
</div>
<p><%- api_connected %></p>
<div>Hello World!</div>