Эх сурвалжийг харах

Merge branch 'unstable' of blezz-tech/sharix-open-webapp-base into unstable

+ 0 - 1
sharix_admin/utils/__init__.py

@@ -1,2 +1 @@
 from .group import *
-from .ticket_gen import *

+ 1 - 1
sharix_admin/views/cooperate.py

@@ -9,7 +9,7 @@ from tickets.models import Ticket, TicketList
 
 from sharix_admin.forms import CompanyForm
 from sharix_admin.utils import *
-from dbsynce.lib import *
+from dbsynce.lib.data import *
 from .base import BaseView