OpenServer/RealtimeDB-OLD
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.stamm.me/OpenServer/RealtimeDB
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Fabian Stamm 2020-06-16 16:25:40 +02:00
commit 16e5753fc6
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
views/admin.html
View File

@ -60,11 +60,7 @@
style="margin: 1rem;" style="margin: 1rem;"
></div> ></div>
</div> </div>
<<<<<<< HEAD
<div style="position: relative;"> <div style="position: relative;">
=======
<div style="position:relative;">
>>>>>>> 0bfdbce908484560108e20cede6f9e7c46710818
<iframe id="content"></iframe> <iframe id="content"></iframe>
</div> </div>
</div> </div>