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

fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle
2010-11-26 08:55:40 -05:00
parent 3756112c7f
commit 68213538d7
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -7,6 +7,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
2.11.12.0 (not yet released) 2.11.12.0 (not yet released)
2.11.11.1 (2010-11-26)
- bug #3115519 (private) [security] XSS on db search
2.11.11.0 (2010-09-07) 2.11.11.0 (2010-09-07)
- [core] Fix broken cleanup of $_GET - [core] Fix broken cleanup of $_GET
- bug #3054458 [core] Fixed displaying number of rows. - bug #3054458 [core] Fixed displaying number of rows.