aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorLibravatar vantezzen <properly@protonmail.com>2019-09-13 17:59:46 +0200
committerLibravatar vantezzen <properly@protonmail.com>2019-09-13 17:59:46 +0200
commitfb095e4984210ec63c5834d6762dec43457dbc57 (patch)
treea2c8b353313cb363a56722687e110c6f80f4b791 /CHANGELOG.md
parentUse ferdi namespace on debugger (diff)
parentUpdate CHANGELOG.md (diff)
downloadferdium-app-fb095e4984210ec63c5834d6762dec43457dbc57.tar.gz
ferdium-app-fb095e4984210ec63c5834d6762dec43457dbc57.tar.zst
ferdium-app-fb095e4984210ec63c5834d6762dec43457dbc57.zip
Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-master
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25ba1b521..7f8cb5729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
1# [5.3.2](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.2) (2019-09-13)
2Merged Franz v5.3.2 into Ferdi
3
1## [5.3.1](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.1) (2019-09-09) 4## [5.3.1](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.1) (2019-09-09)
2Merge Franz v5.3.1 into Ferdi. 5Merge Franz v5.3.1 into Ferdi.
3 6