From 0bf271b7b2da08b5cb2a01e7c0848872eb1e6098 Mon Sep 17 00:00:00 2001
From: kolaente <konrad@kola-entertainments.de>
Date: Fri, 18 May 2018 23:18:22 +0200
Subject: [PATCH] Merge branch 'master' of https://github.com/go-gitea/gitea

# Conflicts:
#	models/issue_comment.go
---
 vendor/code.gitea.io/sdk/gitea/hook.go | 2 ++
 vendor/vendor.json                     | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/vendor/code.gitea.io/sdk/gitea/hook.go b/vendor/code.gitea.io/sdk/gitea/hook.go
index 85d99652d..f34638167 100644
--- a/vendor/code.gitea.io/sdk/gitea/hook.go
+++ b/vendor/code.gitea.io/sdk/gitea/hook.go
@@ -327,6 +327,8 @@ type HookReleaseAction string
 // all release actions
 const (
 	HookReleasePublished HookReleaseAction = "published"
+	HookReleaseUpdated   HookReleaseAction = "updated"
+	HookReleaseDeleted   HookReleaseAction = "deleted"
 )
 
 // ReleasePayload represents a payload information of release event.
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 712706b96..714933bc6 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -9,10 +9,10 @@
 			"revisionTime": "2018-04-21T01:08:19Z"
 		},
 		{
-			"checksumSHA1": "LnxY/6xD4h9dCCJ5nxKEfZZs1Vk=",
+			"checksumSHA1": "2m0bMciZiWzFbfntlaqUpMaIBSA=",
 			"path": "code.gitea.io/sdk/gitea",
-			"revision": "7fa627fa5d67d18c39d6dd3c6c4db836916bf234",
-			"revisionTime": "2018-05-10T12:54:05Z"
+			"revision": "b2308e3f700875a3642a78bd3f6e5db8ef6f974d",
+			"revisionTime": "2018-05-18T06:06:32Z"
 		},
 		{
 			"checksumSHA1": "bOODD4Gbw3GfcuQPU2dI40crxxk=",