nixpkgs/pkgs/applications/office/zotero
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
..
default.nix Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
zotero.sh zotero: use firefox instead of xulrunner to fix i686 build 2014-12-14 13:49:34 -06:00