Merge master into staging

This commit is contained in:
Frederik Rietdijk
2019-02-14 11:35:50 +01:00
67 changed files with 3152 additions and 2951 deletions

View File

@@ -1,5 +1,5 @@
{ stdenv, runCommand, makeWrapper, lndir
, dconf, hicolor-icon-theme, ibus, librsvg, plugins
, dconf, hicolor-icon-theme, ibus, librsvg, plugins ? []
}:
let