diff options
| author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2015-07-02 20:51:12 +0100 |
|---|---|---|
| committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2015-07-02 20:51:12 +0100 |
| commit | e41769bb1fa3bc4f123750dfd8a0202262bf8a14 (patch) | |
| tree | c00357bf928c3603775c32e76f8699e6f1ff842f | |
| parent | abaa8456927092c909f1ee3bcbef17542d26247e (diff) | |
| parent | c22b0427d0c4b90d0fb475e745550369c9505782 (diff) | |
Merge branch 'refactoring' of ssh://git.linaro.org/qa/qa-reports into refactoring
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Conflicts:
requirements-no-deps.txt
| -rw-r--r-- | requirements-no-deps.txt (renamed from qa-reports.requirements-no-deps.txt) | 2 | ||||
| -rw-r--r-- | requirements.txt (renamed from qa-reports.requirements.txt) | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/qa-reports.requirements-no-deps.txt b/requirements-no-deps.txt index 5f4a3bc..a0e0923 100644 --- a/qa-reports.requirements-no-deps.txt +++ b/requirements-no-deps.txt @@ -1,3 +1,3 @@ -django-hstore=1.3.8 +django-hstore==1.3.8 djangorestframework-hstore djorm-pgarray==1.2 diff --git a/qa-reports.requirements.txt b/requirements.txt index ba655e0..c487658 100644 --- a/qa-reports.requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ -e git://git.linaro.org/lava/django-crowd-rest-backend.git@c741f1738786c58253b400ffc27a16967702f84c#egg=django_crowd_rest_backend-dev django-taggit-serializer +django-celery |