Skip to content

Commit

Permalink
Merge pull request #42 from nickatnight/master
Browse files Browse the repository at this point in the history
Merging 'master' into master
  • Loading branch information
nickatnight authored Apr 3, 2020
2 parents e382949 + 4133fea commit 9ded1fb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
18 changes: 7 additions & 11 deletions django_spam/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,30 +41,26 @@

# '10 hours of'...
SPAM_URLS = [
# donald trump saying bing bing bong
'https://www.youtube.com/watch?v=UKbOqEk6rsk',
# darth vader breathing
'https://www.youtube.com/watch?v=un8FAjXWOBY',
# donald trump noises
'https://www.youtube.com/watch?v=GQPO4nmFkCI',
# all star windows xp remix
'https://www.youtube.com/watch?v=bKf9_gF5h5I',
# aint nobody got time for that
'https://www.youtube.com/watch?v=Kp9soHooisk',
# yodelling
'https://www.youtube.com/watch?v=Lxt0_YrQs0M',
# whistling mullet guy
'https://www.youtube.com/watch?v=Sbhoym9yzVQ',
# screaming guy
'https://www.youtube.com/watch?v=CRcYlE3i_-4',
# diggy diggy hole
'https://www.youtube.com/watch?v=ov5pxaIbJlM',
# awesome face song
'https://www.youtube.com/watch?v=WNeni1lbzgY',
# screaming sheep
'https://www.youtube.com/watch?v=SjHUb7NSrNk',
# epic sax guy
'https://www.youtube.com/watch?v=kxopViU98Xo'
'https://www.youtube.com/watch?v=kxopViU98Xo',
# crab rave
'https://www.youtube.com/watch?v=-50NdPawLVY',
# wii theme music
'https://www.youtube.com/watch?v=Twi92KYddW4',
# nyan cat
'https://www.youtube.com/watch?v=wZZ7oFKsKzY'
]

# check if any settings vars have been included to add to the
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

setup(
name='django_spam',
version='0.4.1',
version='0.4.2',
author='Nick Kelly',
author_email='[email protected]',
url='http://github.com/Tivix/django-spam',
Expand Down

0 comments on commit 9ded1fb

Please sign in to comment.