Vladimír Čunát 985d1ac425 Merge branch 'master' into staging-next ... There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611		2019-08-25 14:57:11 +02:00
..
apps	Merge pull request #66136 from worldofpeace/pantheon/reponame	2019-08-06 12:04:40 -04:00
artwork	pantheon: stylize expressions	2019-08-06 11:20:01 -04:00
desktop	pantheon.elementary-gsettings-schemas: use File URI	2019-08-24 16:00:49 -04:00
granite	pantheon: stylize expressions	2019-08-06 11:20:01 -04:00
services	Merge staging-next into staging	2019-08-09 14:01:00 +02:00
default.nix	pantheon.elementary-settings-daemon: 3.30.2 -> 3.32.0	2019-04-05 12:14:14 +02:00
update.nix	pantheon.updateScript: add a throw	2019-08-06 11:20:01 -04:00
update.sh	pantheon: init a 5.0	2019-01-24 20:54:14 +00:00