diff --git a/changelog.rst b/changelog.rst index 1f9de94f3b7..fed30882fa0 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) @@ -206,8 +205,6 @@ Fixed Documentation Minor Documentation Changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- `9caab86 `_ Merge branch '2.5' into 2.6 -- `ff44111 `_ Merge branch '2.3' into 2.5 - `2a29225 `_ #4985 Fixed a typo (javiereguiluz) - `f75bc2b `_ #4972 Fix typos (ifdattic) - `89e626f `_ #4952 symfony 2.7 requires at least php 5.3.9 (scaytrase) @@ -641,10 +638,8 @@ Minor Documentation Changes - `6ceb8cb `_ #4345 Correct capitalization for the Content-Type header (GeertDD) - `3e4c92a `_ #4104 Use ${APACHE_LOG_DIR} instead of /var/log/apache2 (xamgreen) - `3da0776 `_ #4338 ESI Variable Details Continuation (Farkie, weaverryan) -- `9e0e12d `_ Merge branch '2.5' - `7f461d2 `_ #4325 [Components][Form] Correct a typo (fabschurt) - `d162329 `_ #4276 [Components][HttpFoundation] Make a small grammatical adjustment (fabschurt) -- `459052d `_ Merge remote-tracking branch 'origin/2.4' into 2.5 - `69bfac1 `_ #4322 [Components][DependencyInjection] Correct a typo: replace "then" by "the" (fabschurt) - `8073239 `_ #4318 [Cookbook][Bundles] Correct a typo: remove unnecessary "the" word (fabschurt) - `228111b `_ #4316 Remove horizontal scrollbar (ifdattic)