Merge branch 'maint-2.0'
- maint-2.0: global: redesign of requirements.py docker: Dockerfile and compose config rewrite travis: extraction of dev config into script
- Amends setup.py with changes from 10c1f2f. (closes #3041)
kuncar | Apr 21 2015, 13:42 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
83a9ba90c057 | Marco Neumann | global: redesign of requirements.py | Apr 21 2015 | |||
ab72121a2534 | Marco Neumann | docker: Dockerfile and compose config rewrite | Apr 21 2015 | |||
d5d40d1bb7ec | Marco Neumann | travis: extraction of dev config into script | Apr 21 2015 |