gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Marc Delisle 2013-06-13 13:42:39 -04:00
parent b59a884e8b
commit 14bfb4cead
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -20,6 +20,8 @@ phpMyAdmin - ChangeLog
- bug #3962 Proper escaping of JSON export
+ rfe #1328 Optional ReCAPTCHA support
4.0.5.0 (not yet released)
4.0.4.0 (not yet released)
- bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click
- bug #3961 Avoid Suhosin warning when in simulation mode