projects
/
qcg-portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/master'
[qcg-portal.git]
/
qcg
/
forms.py
diff --git
a/qcg/forms.py
b/qcg/forms.py
index
7c715d9
..
b2ad790
100644
(file)
--- a/
qcg/forms.py
+++ b/
qcg/forms.py
@@
-4,6
+4,7
@@
from django.core.validators import RegexValidator
from django.template.defaultfilters import capfirst
from pyqcg.utils import TaskStatus
+from qcg.fields import TimeRangeField
from qcg.models import Task, Allocation