Pre merge

This commit is contained in:
Fergal Moran
2015-10-07 21:01:40 +01:00
parent 086fac87bc
commit 6dd662271b
5 changed files with 4 additions and 0 deletions

View File

@@ -59,3 +59,6 @@ class UserSlugCheckHelper(Helper):
return Response(status=HTTP_204_NO_CONTENT)
except UserProfile.DoesNotExist:
return Response(status=HTTP_200_OK)
class RadioHelper(Helper):
def get(self, request):

View File

@@ -64,6 +64,7 @@ urlpatterns = patterns(
url(r'^_act/play', helpers.ActivityPlayHelper.as_view()),
url(r'^_chat/', helpers.ChatHelper.as_view()),
url(r('^_radio'), helpers.RadioHelper.as_view())
url(r'^__debug/', DebugView.as_view()),

BIN
core/jingles/220.mp3 Normal file

Binary file not shown.

BIN
core/jingles/360.mp3 Normal file

Binary file not shown.

BIN
core/jingles/440.mp3 Normal file

Binary file not shown.