summaryrefslogtreecommitdiff
path: root/requirements
diff options
context:
space:
mode:
authoradityacp2020-04-27 15:04:31 +0530
committeradityacp2020-04-27 15:31:37 +0530
commitb8636965de8a86e68fd542754678e6826c7e5eac (patch)
tree638930dd42140d760e443c0d35874de6e27b3ef9 /requirements
parente3f73db877aaf2f6406bef39aee590530bcb503b (diff)
parent53a0c4ad3e733f3960000527f83565f2fd8fc412 (diff)
downloadonline_test-b8636965de8a86e68fd542754678e6826c7e5eac.tar.gz
online_test-b8636965de8a86e68fd542754678e6826c7e5eac.tar.bz2
online_test-b8636965de8a86e68fd542754678e6826c7e5eac.zip
Resolve conflicts in travis, requirements and views
Diffstat (limited to 'requirements')
-rw-r--r--requirements/requirements-common.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt
index 5e6680c..aae82f3 100644
--- a/requirements/requirements-common.txt
+++ b/requirements/requirements-common.txt
@@ -15,3 +15,4 @@ redis==3.4.1
notifications-plugin==0.1.2
django-celery-beat==2.0.0
django-celery-results==1.2.1
+Pillow