aboutsummaryrefslogtreecommitdiff
path: root/docs/Changelog.md
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-04-21 20:22:11 -0400
committerAllan Wang <me@allanwang.ca>2019-04-21 20:22:11 -0400
commitbbafb7b65ce655c1fdda8badd3098d2a0e1f7f08 (patch)
tree354b0bb6f021af54d1e3586e3e9bda064ad4ef02 /docs/Changelog.md
parente5eb928feacba8d1c634ad8e5d85259ae161cabd (diff)
parentf0f95295bdb2b853aa6262ec4bed2353ce326eee (diff)
downloadfrost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.tar.gz
frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.tar.bz2
frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.zip
Merge dev
Diffstat (limited to 'docs/Changelog.md')
-rw-r--r--docs/Changelog.md16
1 files changed, 16 insertions, 0 deletions
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 4d90b7fb..3d72ec4f 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,8 +1,24 @@
# 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
+* Add shortcut to toggle autoplay in settings > behaviour
+* Update theme
+
+## v2.2.3
+* Add ability to hide stories
+* Remove fbclid from urls
+* Apply notification keyword filter to title as well
+* Remove round icon settings as they are the default in Facebook
+* Update theme
+* Update translations
+>>>>>>> dev
## v2.2.2
* New marketplace shortcut