ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'dev' 

# Conflicts:
#   .gitlab-ci.yml
#   Docker/install_nodejs.sh
#   Dockerfile
#   web/assets/js/bs5.timeline.js
alpha
Moe 2024-04-01 22:58:15 +00:00
parent bac9c55620 2cdf93ba1d
commit 065bfe5b87
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/assets/js/bs5.timeline.js
View File

@ -152,6 +152,7 @@ $(document).ready(function(){
} }
lastDateChecked = new Date(); lastDateChecked = new Date();
} }
lastDateChecked = new Date();
return loadedVideosOnTimeStrip return loadedVideosOnTimeStrip
} }
function selectVideosForCanvas(time, videos){ function selectVideosForCanvas(time, videos){