From ea41786f8c6cd9982d1be3968091f93893a09604 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Fri, 22 Dec 2017 15:15:24 +0900 Subject: [PATCH] Fixup --- CHANGELOG.md | 11 +++++++++++ README.md | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d797f3380..d9110fb01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,17 @@ # Changelog All changes to the project will be documented in this file. +## 4.20.0 - 23 Dec 2017 + +- Squash and rebase merge strategy for pull requests +- Quick pull request creation +- Download patch from the diff view +- Fork and create repository are proceeded asynchronously +- Create new repository by copying existing git repository +- Hide overflowed repository names in the sidebar +- Support CreateEvent web hook +- Display conflicting files if pull request can't be merged + ## 4.19.3 - 7 Dec 2017 - Fix file uploading bug diff --git a/README.md b/README.md index 70edde59b..53472b43c 100644 --- a/README.md +++ b/README.md @@ -73,9 +73,9 @@ What's New in 4.20.x ### 4.20.0 - 23 Dec 2017 -- Download patch from the diff view -- Quick pull request creation - Squash and rebase merge strategy for pull requests +- Quick pull request creation +- Download patch from the diff view - Fork and create repository are proceeded asynchronously - Create new repository by copying existing git repository - Hide overflowed repository names in the sidebar