Commit ff508242 authored by Weblate's avatar Weblate

Merge remote-tracking branch 'origin/master'

parents 67bb1dfd e3ff230e
......@@ -20,11 +20,16 @@ env:
- CI_PIP_DEPS="Django>=1.8,<1.9" CI_DATABASE=postgresql
- CI_PIP_DEPS="Django>=1.7,<1.8"
- CI_PIP_DEPS="Django>=1.8,<1.9"
- CI_PIP_DEPS="--pre django"
- CI_PIP_DEPS="Django>=1.8,<1.9" CI_DATABASE=postgresql CI_MODE=selenium
global:
- DJANGO_SETTINGS_MODULE=weblate.settings_test
- CI_REQUIREMENTS=travis
- CI_MODE=test
matrix:
allow_failures:
- python: "2.7"
env: CI_PIP_DEPS="--pre django"
# commands to install dependencies
install:
- ./ci/install
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment