Merge branch 'master' into staging

This commit is contained in:
Jan Tojnar
2018-12-24 15:02:29 +01:00
336 changed files with 5417 additions and 2469 deletions
@@ -45,12 +45,6 @@ let
};
in rec {
vala_0_34 = generic {
major = "0.34";
minor = "18";
sha256 = "1lhw3ghns059y5d6pdldy5p4yjwlhcls84k892i6qmbhxg34945q";
};
vala_0_36 = generic {
major = "0.36";
minor = "17";