mirror of
https://github.com/Hopiu/django-markdownx.git
synced 2026-05-21 10:51:53 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
a8db6a0d0c
2 changed files with 8 additions and 4 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -59,3 +59,7 @@ node_modules/
|
|||
/docs/src/_theme/sphinx_rtd_theme/bower_components
|
||||
/docs/src/_theme/sphinx_rtd_theme/build
|
||||
/docs/src/_theme/sphinx_rtd_theme/dist
|
||||
Vagrantfile
|
||||
manage.py
|
||||
runtests.py
|
||||
bootstrap.sh
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ matrix:
|
|||
- python: 2.7
|
||||
env: DJANGO=1.10.*
|
||||
- python: 2.7
|
||||
env: DJANGO=1.11
|
||||
env: DJANGO=1.11.*
|
||||
|
||||
- python: 3.4
|
||||
env: DJANGO=1.8.*
|
||||
|
|
@ -19,7 +19,7 @@ matrix:
|
|||
- python: 3.4
|
||||
env: DJANGO=1.10.*
|
||||
- python: 3.4
|
||||
env: DJANGO=1.11
|
||||
env: DJANGO=1.11.*
|
||||
|
||||
- python: 3.5
|
||||
env: DJANGO=1.8.*
|
||||
|
|
@ -28,7 +28,7 @@ matrix:
|
|||
- python: 3.5
|
||||
env: DJANGO=1.10.*
|
||||
- python: 3.5
|
||||
env: DJANGO=1.11
|
||||
env: DJANGO=1.11.*
|
||||
|
||||
- python: 3.6
|
||||
env: DJANGO=1.8.*
|
||||
|
|
@ -37,7 +37,7 @@ matrix:
|
|||
- python: 3.6
|
||||
env: DJANGO=1.10.*
|
||||
- python: 3.6
|
||||
env: DJANGO=1.11
|
||||
env: DJANGO=1.11.*
|
||||
|
||||
- os: osx
|
||||
language: generic
|
||||
|
|
|
|||
Loading…
Reference in a new issue