- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] fb3625: Translated using Weblate (French)
by Marc Delisle 25 May '14

25 May '14

Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: fb3625050685c9f04d7ad0f660b2906b1fa478bb https://github.com/phpmyadmin/phpmyadmin/commit/fb3625050685c9f04d7ad0f660b… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (2770 of 2770)

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 56cbb7: Improve English
by Marc Delisle 25 May '14

25 May '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 56cbb769cca1a7f599315797e2840e93e533c38b https://github.com/phpmyadmin/phpmyadmin/commit/56cbb769cca1a7f599315797e28… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M js/messages.php Log Message: ----------- Improve English Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 9303d465bb8e734b2b82c284eca0673a18cd8be8 https://github.com/phpmyadmin/phpmyadmin/commit/9303d465bb8e734b2b82c284eca… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c417efade8a1...9303d465bb8e

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c864e0: Translated using Weblate (Danish)
by Claus Svalekjaer 24 May '14

24 May '14

Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: c864e09c059d915e711f5e551967b0da10307a2c https://github.com/phpmyadmin/phpmyadmin/commit/c864e09c059d915e711f5e55196… Author: Claus Svalekjaer <just.my.smtp.server(a)gmail.com> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M po/da.po Log Message: ----------- Translated using Weblate (Danish) Currently translated at 100.0% (2770 of 2770)

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c417ef: Translated using Weblate (Danish)
by Claus Svalekjaer 24 May '14

24 May '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c417efade8a148c34a4cf4dc5aabd1f30ac7425a https://github.com/phpmyadmin/phpmyadmin/commit/c417efade8a148c34a4cf4dc5aa… Author: Claus Svalekjaer <just.my.smtp.server(a)gmail.com> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M po/da.po Log Message: ----------- Translated using Weblate (Danish) Currently translated at 100.0% (2772 of 2772)

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 43d123: Code style fixes
by Ann + J.M 24 May '14

24 May '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 43d12395833d3ae623565ab451ef8e9a11c2ec17 https://github.com/phpmyadmin/phpmyadmin/commit/43d12395833d3ae623565ab451e… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M js/ajax.js M js/columndelete.js M js/error_report.js M js/makegrid.js M js/menu-resizer.js M js/navigation.js M js/server_databases.js M js/sql.js M js/tbl_chart.js M js/tbl_select.js Log Message: ----------- Code style fixes Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 60fca6: Missing message for /setup
by Marc Delisle 24 May '14

24 May '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 60fca6363095bff9d4d9ae97c369ab2cfc24cdf8 https://github.com/phpmyadmin/phpmyadmin/commit/60fca6363095bff9d4d9ae97c36… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M libraries/config/messages.inc.php Log Message: ----------- Missing message for /setup Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 7b00947113ee8d04b1f66c7452e0253b5d76c830 https://github.com/phpmyadmin/phpmyadmin/commit/7b00947113ee8d04b1f66c7452e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files Commit: 68eca169a8c155b26c125a8ded7333333527a49d https://github.com/phpmyadmin/phpmyadmin/commit/68eca169a8c155b26c125a8ded7… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M libraries/config/messages.inc.php Log Message: ----------- Merge commit '60fca63' Commit: ee7d79359964a2192637100b7978fb04fd35d702 https://github.com/phpmyadmin/phpmyadmin/commit/ee7d79359964a2192637100b797… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-24 (Sat, 24 May 2014) Log Message: ----------- Merge commit '7b00947' Commit: 9c0a72d99672ae2a6c0e5ee682d79767eeeda41e https://github.com/phpmyadmin/phpmyadmin/commit/9c0a72d99672ae2a6c0e5ee682d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files Compare: https://github.com/phpmyadmin/phpmyadmin/compare/489826139efa...9c0a72d99672

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 60fca6: Missing message for /setup
by Marc Delisle 24 May '14

24 May '14

Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 60fca6363095bff9d4d9ae97c369ab2cfc24cdf8 https://github.com/phpmyadmin/phpmyadmin/commit/60fca6363095bff9d4d9ae97c36… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M libraries/config/messages.inc.php Log Message: ----------- Missing message for /setup Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 7b00947113ee8d04b1f66c7452e0253b5d76c830 https://github.com/phpmyadmin/phpmyadmin/commit/7b00947113ee8d04b1f66c7452e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-24 (Sat, 24 May 2014) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files Compare: https://github.com/phpmyadmin/phpmyadmin/compare/16036ac14377...7b00947113ee

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 56d5ef: Date format problem in firefox, use jquery datepic...
by Marc Delisle 23 May '14

23 May '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 56d5ef04a0cf0a52cdd7082e43c6e62dc672f830 https://github.com/phpmyadmin/phpmyadmin/commit/56d5ef04a0cf0a52cdd7082e43c… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-05-22 (Thu, 22 May 2014) Changed paths: M js/server_status_monitor.js Log Message: ----------- Date format problem in firefox, use jquery datepicker to get date Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Commit: 54e2c0f82accf03b4c9824dd838bd84d958620e0 https://github.com/phpmyadmin/phpmyadmin/commit/54e2c0f82accf03b4c9824dd838… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-05-22 (Thu, 22 May 2014) Changed paths: M js/server_status_monitor.js Log Message: ----------- Use setdate and make input readonly Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Commit: 16036ac14377fe247a076956e2523627c963c728 https://github.com/phpmyadmin/phpmyadmin/commit/16036ac14377fe247a076956e25… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-05-22 (Thu, 22 May 2014) Changed paths: M ChangeLog M js/tbl_structure.js Log Message: ----------- Fix bug#4424 Table indexes disappear after altering field Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Commit: c1756b96e388e5bc7270b233590c0355909075a6 https://github.com/phpmyadmin/phpmyadmin/commit/c1756b96e388e5bc7270b233590… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge commit '56d5ef0' Commit: 7e43534848472b3174cdbf4fb404b94d97327332 https://github.com/phpmyadmin/phpmyadmin/commit/7e43534848472b3174cdbf4fb40… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge commit '54e2c0f' Commit: 489826139efab6cb44881485ae7cd3c68121fd89 https://github.com/phpmyadmin/phpmyadmin/commit/489826139efab6cb44881485ae7… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Changed paths: M ChangeLog M js/tbl_structure.js Log Message: ----------- Merge commit '16036ac' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1a32869ba15c...489826139efa

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 28074d: Code style fixes
by Marc Delisle 23 May '14

23 May '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 28074d27f4eeebf3cb315b90c274b157b10cded4 https://github.com/phpmyadmin/phpmyadmin/commit/28074d27f4eeebf3cb315b90c27… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M test/libraries/PMA_Tracker_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_tbl_columns_definition_form_test.php Log Message: ----------- Code style fixes Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: d666ed61af1d5bbb20e65f49d0eedc0576d0ad43 https://github.com/phpmyadmin/phpmyadmin/commit/d666ed61af1d5bbb20e65f49d0e… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M libraries/mysql_charsets.lib.php Log Message: ----------- Comment that missing break statement is intended Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: daaf70bca2f017c406835250e39976db65370129 https://github.com/phpmyadmin/phpmyadmin/commit/daaf70bca2f017c406835250e39… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M libraries/properties/options/OptionsPropertyOneItem.class.php Log Message: ----------- Rename OptionsPropertyOneItem::$_force overwritten from parent Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 524e82e33c66a984e0cb52f9730b339e4d275636 https://github.com/phpmyadmin/phpmyadmin/commit/524e82e33c66a984e0cb52f9730… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M libraries/server_status_variables.lib.php Log Message: ----------- Extrace query cache total blocks value correctly Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 5facff36bd4e4215072aac4abbd163f0159120d5 https://github.com/phpmyadmin/phpmyadmin/commit/5facff36bd4e4215072aac4abbd… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M libraries/sqlparser.lib.php Log Message: ----------- Add missing break in # comment detection switch Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: ec29a0c59d85d192c0fea9b3f13c65b0bbb15a8c https://github.com/phpmyadmin/phpmyadmin/commit/ec29a0c59d85d192c0fea9b3f13… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M test/libraries/PMA_tbl_columns_definition_form_test.php Log Message: ----------- Add missing ) Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 20b2a3a707ff061fb1cf43154ad684aa6c080bdd https://github.com/phpmyadmin/phpmyadmin/commit/20b2a3a707ff061fb1cf43154ad… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Changed paths: M test/libraries/PMA_Tracker_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_tbl_columns_definition_form_test.php Log Message: ----------- Merge commit '28074d2' Commit: 7630006be282a077cdd8089ad9e9d1f2a134f869 https://github.com/phpmyadmin/phpmyadmin/commit/7630006be282a077cdd8089ad9e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Changed paths: M libraries/mysql_charsets.lib.php Log Message: ----------- Merge commit 'd666ed6' Commit: e50b0d2b719669222a99309611086c4238bace69 https://github.com/phpmyadmin/phpmyadmin/commit/e50b0d2b719669222a993096110… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Changed paths: M libraries/properties/options/OptionsPropertyOneItem.class.php Log Message: ----------- Merge commit 'daaf70b' Commit: decbcdfeee8b490f5bf9d1a1e03392c88991885c https://github.com/phpmyadmin/phpmyadmin/commit/decbcdfeee8b490f5bf9d1a1e03… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Changed paths: M libraries/server_status_variables.lib.php Log Message: ----------- Merge commit '524e82e' Commit: ad1e2352cac1200923a6f5b50d981eb746673e0a https://github.com/phpmyadmin/phpmyadmin/commit/ad1e2352cac1200923a6f5b50d9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 1a32869ba15c459c634dc92e6b14fbf569bac2aa https://github.com/phpmyadmin/phpmyadmin/commit/1a32869ba15c459c634dc92e6b1… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Changed paths: M test/libraries/PMA_tbl_columns_definition_form_test.php Log Message: ----------- Merge commit 'ec29a0c' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9373e1b2041a...1a32869ba15c

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ddbe5a: DBQbe::_getInsDelAndOrCell: Fix PHPDoc param type
by Marc Delisle 23 May '14

23 May '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ddbe5aed270142b478cf261283ae015da9bfece2 https://github.com/phpmyadmin/phpmyadmin/commit/ddbe5aed270142b478cf261283a… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M libraries/DBQbe.class.php Log Message: ----------- DBQbe::_getInsDelAndOrCell: Fix PHPDoc param type Commit: 5ddd0c1990ebd54722fb95c156866d0ef25eccfc https://github.com/phpmyadmin/phpmyadmin/commit/5ddd0c1990ebd54722fb95c1568… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M libraries/Tracker.class.php M libraries/Util.class.php M libraries/tbl_tracking.lib.php M libraries/url_generating.lib.php M test/classes/PMA_DisplayResults_test.php M test/classes/config/PMA_FormDisplay_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_relation_cleanup_test.php M test/libraries/PMA_server_status_test.php Log Message: ----------- Code style fixes Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 1acfaf4a7fe0fbfd1869748d6555ad0ece36e0cd https://github.com/phpmyadmin/phpmyadmin/commit/1acfaf4a7fe0fbfd1869748d655… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Changed paths: M libraries/DBQbe.class.php Log Message: ----------- Merge commit 'ddbe5ae' Commit: 9373e1b2041a21d51be6d5ecde5a96a6e228c238 https://github.com/phpmyadmin/phpmyadmin/commit/9373e1b2041a21d51be6d5ecde5… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-23 (Fri, 23 May 2014) Changed paths: M libraries/Tracker.class.php M libraries/Util.class.php M libraries/tbl_tracking.lib.php M libraries/url_generating.lib.php M test/classes/PMA_DisplayResults_test.php M test/classes/config/PMA_FormDisplay_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_relation_cleanup_test.php M test/libraries/PMA_server_status_test.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e98a9a7bdb4e...9373e1b2041a

1 0