From 233015e0699614bb9657fe7c38784452368e70e2 Mon Sep 17 00:00:00 2001 From: LeandroRoberto Date: Fri, 4 Aug 2017 10:05:29 -0300 Subject: [PATCH] =?UTF-8?q?Impl=20estrutura=20base=20para=20busca=20de=20p?= =?UTF-8?q?oss=C3=ADveis=20autores?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/api/forms.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sapl/api/forms.py b/sapl/api/forms.py index d1445f7df..bd6904917 100644 --- a/sapl/api/forms.py +++ b/sapl/api/forms.py @@ -1,7 +1,10 @@ from django.db.models import Q, F from django.forms.fields import CharField, MultiValueField from django.forms.widgets import MultiWidget, TextInput +<<<<<<< 81d175e66dec22aa3542d5de92129a7688b14e0b from django.utils import timezone +======= +>>>>>>> Impl estrutura base para busca de possíveis autores from django.utils.translation import ugettext_lazy as _ from django_filters.filters import MethodFilter, ModelChoiceFilter, DateFilter from rest_framework import serializers