From ae40088217a1b99411e28ea77bdfd7c66f582074 Mon Sep 17 00:00:00 2001
From: 6543 <6543@noreply.gitea.io>
Date: Sun, 19 Apr 2020 11:02:29 +0000
Subject: [PATCH] merge pr options added

---
 Features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Features.md b/Features.md
index 7ec703c..af418e8 100644
--- a/Features.md
+++ b/Features.md
@@ -12,7 +12,7 @@
 - Themes (choose from settings)
 - Download files in fileviewer (need write permissions)
 - Night mode in PDF (fileviewer)
-- Merge pull request
+- Merge pull request (merge, merge -no-ff, rebase, squash) 
 - Diff view of PR files for public repositories
 - File and directory browser
 - File viewer