diff --git a/changelog.rst b/changelog.rst index c1e48eaf29a..a27dcc721cb 100644 --- a/changelog.rst +++ b/changelog.rst @@ -34,7 +34,6 @@ Fixed Documentation - `6641b4b `_ #5202 added missing tab (martinbertinat) - `49f6b2a `_ #5211 Rebase #5182 (Balamung) - `318bb8a `_ #5187 Fixing a bad bcrypt string using http://www.bcrypt-generator.com/ (weaverryan) -- `93ecd0a `_ Merge branch '2.6' into 2.7 - `6fb2eea `_ #5162 Fix misplelled XliffFileLoader class in the Using Domains (Nicola Pietroluongo) - `402b586 `_ #5162 Fix misplelled XliffFileLoader class in the Using Message Domains (Nicola Pietroluongo) - `8fc3d6c `_ #5149 Fixed loadUserByUsername method coding errors (Linas Merkevicius)