diff options
| author | Allan Wang <me@allanwang.ca> | 2019-04-21 20:26:01 -0400 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2019-04-21 20:26:01 -0400 |
| commit | 4739e6f58df1116babac69896764e83db551f583 (patch) | |
| tree | 5ec13511c0832a5fabe3f6ca812284229c847c24 /docs | |
| parent | bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08 (diff) | |
| download | frost-4739e6f58df1116babac69896764e83db551f583.tar.gz frost-4739e6f58df1116babac69896764e83db551f583.tar.bz2 frost-4739e6f58df1116babac69896764e83db551f583.zip | |
Merge properties
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Changelog.md | 6 |
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 |