diff options
Diffstat (limited to 'phpBB/docs/CHANGELOG.html')
-rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d4f6a1149c..e2bb0a6ba1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -187,6 +187,8 @@ p a { <ul class="menu"> <li>[Fix] Re-allow searching within the memberlist</li> <li>[Fix] Force prune related values to integers during conversions</li> + <li>[Fix] Updater now detects successfully merged files having conflicts and user chose to merge with modifications [Bug #12685]</li> + <li>[Fix] Updater is no longer listing missing language entries and styles if these had been removed [Bug #12655]</li> </ul> </div> |