Revert "Revert "Merge master into staging-next""

In 87a19e9048 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master.

This reverts commit 0be87c7979.
This commit is contained in:
Frederik Rietdijk
2020-02-05 19:41:25 +01:00
parent 873e6a4e65
commit 419bc0a4cd
28 changed files with 297 additions and 422 deletions
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "documize-community";
version = "3.6.0";
version = "3.7.0";
src = fetchFromGitHub {
owner = "documize";
repo = "community";
rev = "v${version}";
sha256 = "0wic4j7spw9ya1m6yz0mkpqi1px6jd2vk60w8ldx0m0k606wy6ir";
sha256 = "1pcldf9lqvpb2h2a3kr3mahj2v1jasjwrszj6czjmkyml7x2sz7c";
};
modSha256 = "1z0v7n8klaxcqv7mvzf3jzgrp78zb4yiibx899ppk6i5qnj4xiv0";