Thomas Waldmann 740312f725 Merge branch '1.0-maint' into merge-1.0-maint ... # Conflicts: # requirements.d/development.txt # tox.ini		2017-01-15 01:15:04 +01:00
..
install.sh	Merge branch '1.0-maint' into merge-1.0-maint	2017-01-15 01:15:04 +01:00
run.sh	…
upload_coverage.sh	fix .coverage processing	2016-08-22 01:15:03 +02:00