aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/Changelog.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 7a6bbfab..3d72ec4f 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,5 +1,10 @@
# 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
@@ -13,6 +18,7 @@
* Remove round icon settings as they are the default in Facebook
* Update theme
* Update translations
+>>>>>>> dev
## v2.2.2
* New marketplace shortcut