carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity

Merge branch 'feature/#3_accounting_dialog' into develop

Browse Source 
# Conflicts:
#	billard/models.py
#	billard/views.py
This commit is contained in:
Robert Einsle 2017-03-09 20:52:34 +01:00
parent 201c347fcc
commit 29ef5ac541
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
billard/views.py
View File

@ -1,5 +1,5 @@
from billard.serializers import LocationDataSerializer from billard.serializers import LocationDataSerializer
from billard.models import LocationData, Location, Client from billard.models import LocationData, Location, Client, Accounting
from billard.tasks import process_location_data from billard.tasks import process_location_data
from rest_framework import viewsets from rest_framework import viewsets
from django.shortcuts import render, redirect from django.shortcuts import render, redirect