From 29ef5ac541121f4c0a69babd9da2f53be699d7b7 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Thu, 9 Mar 2017 20:52:34 +0100 Subject: [PATCH] Merge branch 'feature/#3_accounting_dialog' into develop # Conflicts: # billard/models.py # billard/views.py --- billard/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/billard/views.py b/billard/views.py index 8cab675..b0384b3 100644 --- a/billard/views.py +++ b/billard/views.py @@ -1,5 +1,5 @@ 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 rest_framework import viewsets from django.shortcuts import render, redirect