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

Fix merge conflict

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2015-10-09 21:10:28 -04:00
commit e4e991d3fc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -40,6 +40,7 @@ phpMyAdmin - ChangeLog
- issue #11542 Import parser and backslash
- issue #11546 "Visualize GIS data" seems to be broken
- issue #11548 Confirm box on "Reset slave" option
- issue Fix cookies clearing on version change
4.5.0.2 (2015-09-25)
- issue #11497 Incorrect indexes when exporting

2
libraries/common.inc.php
View File

@ -1200,4 +1200,4 @@ if (! defined('PMA_MINIMUM_COMMON')) {
include_once 'libraries/config/messages.inc.php';
include 'libraries/config/user_preferences.forms.php';
include_once 'libraries/config/page_settings.forms.php';
}
}