Merge branch 'staging' into release-16.09

This commit is contained in:
Domen Kožar
2016-09-01 21:32:34 +02:00
41 changed files with 55 additions and 52 deletions

View File

@@ -8,7 +8,7 @@ mkPythonDerivation rec {
sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
};
outputs = [ "out" "docdev" ];
outputs = [ "out" "devdoc" ];
patches = [
# Fix warning spam