From 4739e6f58df1116babac69896764e83db551f583 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 21 Apr 2019 20:26:01 -0400 Subject: Merge properties --- docs/Changelog.md | 6 ------ 1 file changed, 6 deletions(-) (limited to 'docs') diff --git a/docs/Changelog.md b/docs/Changelog.md index 3d72ec4f..7a6bbfab 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -1,10 +1,5 @@ # Changelog -<<<<<<< HEAD -## v2.2.3 -* Add ability to hide stories -* Remove fbclid from urls -======= ## v2.2.4 * Show top bar to allow sharing posts * Fix unmuting videos when autoplay is enabled @@ -18,7 +13,6 @@ * Remove round icon settings as they are the default in Facebook * Update theme * Update translations ->>>>>>> dev ## v2.2.2 * New marketplace shortcut -- cgit v1.2.3