aboutsummaryrefslogtreecommitdiff
path: root/docs/Changelog.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/Changelog.md')
-rw-r--r--docs/Changelog.md6
1 files changed, 0 insertions, 6 deletions
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