Skip to content
Snippets Groups Projects
Commit 0ff07ad7 authored by jda92's avatar jda92
Browse files

Merge branch 'developer' into 'master' 

generate.html update and added more music

See merge request !5
parents e264f217 4e835bef
No related branches found
No related tags found
1 merge request!5generate.html update and added more music
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 0 deletions
.DS_Store
+ 0
− 0
View file @ 0ff07ad7
No preview for this file type
fantasmixDjango/.DS_Store
+ 0
− 0
View file @ 0ff07ad7
No preview for this file type
fantasmixDjango/django_project/.DS_Store
+ 0
− 0
View file @ 0ff07ad7
No preview for this file type
fantasmixDjango/django_project/out.wav deleted 100644 → 0
+ 0
− 0
View file @ e264f217
File deleted
fantasmixDjango/django_project/static/audio/Lil_Dicky_Part_2.mid 0 → 100644
+ 0
− 0
View file @ 0ff07ad7
File added
fantasmixDjango/django_project/static/audio/convertedFiles/Lil_Dicky_Part_2.wav 0 → 100644
+ 0
− 0
View file @ 0ff07ad7
File added
fantasmixDjango/django_project/static/audio/convertedFiles/name.wav
+ 0
− 0
View file @ 0ff07ad7
No preview for this file type
fantasmixDjango/django_project/static/audio/name.mid
+ 0
− 0
View file @ 0ff07ad7
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment