Vladimír Čunát ded9a4b1aa Merge branch 'staging-next' into staging ...

Commits from master, conflict resolutions, etc.

2018-08-13 20:57:50 +02:00

..

analyzer.nix

sqlite,sqlar: add licenses

2018-08-11 14:32:05 +02:00

archive-version.nix

Revert "sqlite{,-analyzer}: use the same src (#40945)"

2018-05-27 00:43:26 -05:00

default.nix

Merge branch 'staging-next' into staging

2018-08-13 20:57:50 +02:00

sqlar.nix

sqlite,sqlar: add licenses

2018-08-11 14:32:05 +02:00