- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dca981: Remove plugin manager and observer classes
by Michal Čihař 25 Jun '14

25 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dca981481dbcb92154b1c0de214c45604d7c2cbe https://github.com/phpmyadmin/phpmyadmin/commit/dca981481dbcb92154b1c0de214… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M libraries/DisplayResults.class.php M libraries/plugins/AuthenticationPlugin.class.php M libraries/plugins/ExportPlugin.class.php M libraries/plugins/ImportPlugin.class.php R libraries/plugins/PluginManager.class.php R libraries/plugins/PluginObserver.class.php M libraries/plugins/TransformationsPlugin.class.php M libraries/plugins/auth/AuthenticationConfig.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationHttp.class.php M libraries/plugins/auth/AuthenticationSignon.class.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportExcel.class.php M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportMediawiki.class.php M libraries/plugins/export/ExportOds.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportPdf.class.php M libraries/plugins/export/ExportPhparray.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportTexytext.class.php M libraries/plugins/export/ExportXml.class.php M libraries/plugins/export/ExportYaml.class.php M libraries/plugins/export/README M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportMediawiki.class.php M libraries/plugins/import/ImportOds.class.php M libraries/plugins/import/ImportShp.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/ImportXml.class.php M libraries/plugins/import/README M libraries/plugins/transformations/TEMPLATE_ABSTRACT M libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php M libraries/plugins/transformations/abstract/PreApPendTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php M test/classes/PMA_DisplayResults_test.php R test/classes/plugin/PMA_PluginManager_test.php M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php M test/classes/plugin/auth/PMA_AuthenticationSignon_test.php M test/classes/plugin/import/ImportCsv_test.php M test/classes/plugin/import/ImportLdi_test.php M test/classes/plugin/import/ImportMediawiki_test.php M test/classes/plugin/import/ImportOds_test.php M test/classes/plugin/import/ImportShp_test.php M test/classes/plugin/import/ImportSql_test.php M test/classes/plugin/import/ImportXml_test.php M test/classes/plugin/transformations/Image_JPEG_Inline_test.php M test/classes/plugin/transformations/Image_Link_test.php M test/classes/plugin/transformations/Image_PNG_Inline_test.php M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php M test/classes/plugin/transformations/Text_Plain_Download_test.php M test/classes/plugin/transformations/Text_Plain_External_test.php M test/classes/plugin/transformations/Text_Plain_Formatted_test.php M test/classes/plugin/transformations/Text_Plain_Hex_test.php M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php M test/classes/plugin/transformations/Text_Plain_Link_test.php M test/classes/plugin/transformations/Text_Plain_Longtoipv4_test.php M test/classes/plugin/transformations/Text_Plain_Sql_test.php M test/classes/plugin/transformations/Text_Plain_Substring_test.php Log Message: ----------- Remove plugin manager and observer classes We don't really need the observer pattern, so let's simplify the code. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 34fec13115254c145553fa929b6a6b951383579e https://github.com/phpmyadmin/phpmyadmin/commit/34fec13115254c145553fa929b6… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M libraries/DisplayResults.class.php M libraries/plugins/AuthenticationPlugin.class.php M libraries/plugins/ExportPlugin.class.php M libraries/plugins/ImportPlugin.class.php R libraries/plugins/PluginManager.class.php R libraries/plugins/PluginObserver.class.php M libraries/plugins/TransformationsPlugin.class.php M libraries/plugins/auth/AuthenticationConfig.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationHttp.class.php M libraries/plugins/auth/AuthenticationSignon.class.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportExcel.class.php M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportMediawiki.class.php M libraries/plugins/export/ExportOds.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportPdf.class.php M libraries/plugins/export/ExportPhparray.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportTexytext.class.php M libraries/plugins/export/ExportXml.class.php M libraries/plugins/export/ExportYaml.class.php M libraries/plugins/export/README M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportMediawiki.class.php M libraries/plugins/import/ImportOds.class.php M libraries/plugins/import/ImportShp.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/ImportXml.class.php M libraries/plugins/import/README M libraries/plugins/transformations/TEMPLATE_ABSTRACT M libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php M libraries/plugins/transformations/abstract/PreApPendTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php M test/classes/PMA_DisplayResults_test.php R test/classes/plugin/PMA_PluginManager_test.php M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php M test/classes/plugin/auth/PMA_AuthenticationSignon_test.php M test/classes/plugin/import/ImportCsv_test.php M test/classes/plugin/import/ImportLdi_test.php M test/classes/plugin/import/ImportMediawiki_test.php M test/classes/plugin/import/ImportOds_test.php M test/classes/plugin/import/ImportShp_test.php M test/classes/plugin/import/ImportSql_test.php M test/classes/plugin/import/ImportXml_test.php M test/classes/plugin/transformations/Image_JPEG_Inline_test.php M test/classes/plugin/transformations/Image_Link_test.php M test/classes/plugin/transformations/Image_PNG_Inline_test.php M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php M test/classes/plugin/transformations/Text_Plain_Download_test.php M test/classes/plugin/transformations/Text_Plain_External_test.php M test/classes/plugin/transformations/Text_Plain_Formatted_test.php M test/classes/plugin/transformations/Text_Plain_Hex_test.php M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php M test/classes/plugin/transformations/Text_Plain_Link_test.php M test/classes/plugin/transformations/Text_Plain_Longtoipv4_test.php M test/classes/plugin/transformations/Text_Plain_Sql_test.php M test/classes/plugin/transformations/Text_Plain_Substring_test.php Log Message: ----------- Merge pull request #1252 from nijel/remove-observer Remove plugin manager and observer classes Compare: https://github.com/phpmyadmin/phpmyadmin/compare/217dbde13236...34fec1311525

1 0

[Phpmyadmin-git] [phpmyadmin/localized_docs] a7d56c: Translated using Weblate (Turkish)
by Weblate 25 Jun '14

25 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: a7d56ccc9141d85bbe0918e2126b4938e4c276db https://github.com/phpmyadmin/localized_docs/commit/a7d56ccc9141d85bbe0918e… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M po/tr.mo M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 99.2% (1610 of 1622) Commit: cb459622797eb56c6afcf17908c8b03bb0a70d21 https://github.com/phpmyadmin/localized_docs/commit/cb459622797eb56c6afcf17… Author: Weblate <noreply(a)weblate.org> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M Makefile A docs/et/Makefile A docs/et/_ext A docs/et/conf.py A docs/et/config.rst A docs/et/copyright.rst A docs/et/credits.rst A docs/et/developers.rst A docs/et/faq.rst A docs/et/glossary.rst A docs/et/index.rst A docs/et/intro.rst A docs/et/make.bat A docs/et/other.rst A docs/et/privileges.rst A docs/et/require.rst A docs/et/setup.rst A docs/et/transformations.rst A docs/et/user.rst A docs/et/vendors.rst A po/et.mo A po/et.po A translated/et/LC_MESSAGES/config.mo A translated/et/LC_MESSAGES/copyright.mo A translated/et/LC_MESSAGES/credits.mo A translated/et/LC_MESSAGES/developers.mo A translated/et/LC_MESSAGES/faq.mo A translated/et/LC_MESSAGES/glossary.mo A translated/et/LC_MESSAGES/index.mo A translated/et/LC_MESSAGES/intro.mo A translated/et/LC_MESSAGES/require.mo A translated/et/LC_MESSAGES/setup.mo A translated/et/LC_MESSAGES/transformations.mo A translated/et/LC_MESSAGES/vendors.mo Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/localized_docs/compare/98a2cf9ae502...cb45962…

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 90982b: Translated using Weblate (Interlingua)
by Weblate 25 Jun '14

25 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 90982b2cc2b952d984899c17a26ad7d773bcd1b6 https://github.com/phpmyadmin/phpmyadmin/commit/90982b2cc2b952d984899c17a26… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 55.1% (1563 of 2834) Commit: 217dbde13236e8ef006f7a5b803ba59f996535c4 https://github.com/phpmyadmin/phpmyadmin/commit/217dbde13236e8ef006f7a5b803… Author: Weblate <noreply(a)weblate.org> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6620d0c193f9...217dbde13236

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e6f6da: Fixed cookie based login for installations without...
by Michal Čihař 25 Jun '14

25 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e6f6dab3b096e78d8118b29495085753a9095d2d https://github.com/phpmyadmin/phpmyadmin/commit/e6f6dab3b096e78d8118b294950… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Fixed cookie based login for installations without mcrypt bug #4469 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 18370fc63eb17b7bedd0112b46f746c3648574ca https://github.com/phpmyadmin/phpmyadmin/commit/18370fc63eb17b7bedd0112b46f… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 54.5% (1512 of 2770) Commit: 90a8a74afa54c0afba3b27169694d8ce77f83c6b https://github.com/phpmyadmin/phpmyadmin/commit/90a8a74afa54c0afba3b2716969… Author: Weblate <noreply(a)weblate.org> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: 06b1ffc8da3ea4ca873f377dd34ea83e42448d30 https://github.com/phpmyadmin/phpmyadmin/commit/06b1ffc8da3ea4ca873f377dd34… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Fix comments Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6620d0c193f9f748e7c263f5c6bb82d8b0de2cf9 https://github.com/phpmyadmin/phpmyadmin/commit/6620d0c193f9f748e7c263f5c6b… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-25 (Wed, 25 Jun 2014) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f9c6a3b0c8bd...6620d0c193f9

1 0

[Phpmyadmin-git] [phpmyadmin/localized_docs] 98a2cf: Add Estonian translation
by Michal Čihař 25 Jun '14

25 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: 98a2cf9ae502323eefd808e18574125b63ab3fa3 https://github.com/phpmyadmin/localized_docs/commit/98a2cf9ae502323eefd808e… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M Makefile A docs/et/Makefile A docs/et/_ext A docs/et/conf.py A docs/et/config.rst A docs/et/copyright.rst A docs/et/credits.rst A docs/et/developers.rst A docs/et/faq.rst A docs/et/glossary.rst A docs/et/index.rst A docs/et/intro.rst A docs/et/make.bat A docs/et/other.rst A docs/et/privileges.rst A docs/et/require.rst A docs/et/setup.rst A docs/et/transformations.rst A docs/et/user.rst A docs/et/vendors.rst A po/et.mo A po/et.po A translated/et/LC_MESSAGES/config.mo A translated/et/LC_MESSAGES/copyright.mo A translated/et/LC_MESSAGES/credits.mo A translated/et/LC_MESSAGES/developers.mo A translated/et/LC_MESSAGES/faq.mo A translated/et/LC_MESSAGES/glossary.mo A translated/et/LC_MESSAGES/index.mo A translated/et/LC_MESSAGES/intro.mo A translated/et/LC_MESSAGES/require.mo A translated/et/LC_MESSAGES/setup.mo A translated/et/LC_MESSAGES/transformations.mo A translated/et/LC_MESSAGES/vendors.mo Log Message: ----------- Add Estonian translation Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 18370f: Translated using Weblate (Interlingua)
by Weblate 25 Jun '14

25 Jun '14

Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 18370fc63eb17b7bedd0112b46f746c3648574ca https://github.com/phpmyadmin/phpmyadmin/commit/18370fc63eb17b7bedd0112b46f… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 54.5% (1512 of 2770) Commit: 90a8a74afa54c0afba3b27169694d8ce77f83c6b https://github.com/phpmyadmin/phpmyadmin/commit/90a8a74afa54c0afba3b2716969… Author: Weblate <noreply(a)weblate.org> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e6f6dab3b096...90a8a74afa54

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e6f6da: Fixed cookie based login for installations without...
by Michal Čihař 25 Jun '14

25 Jun '14

Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e6f6dab3b096e78d8118b29495085753a9095d2d https://github.com/phpmyadmin/phpmyadmin/commit/e6f6dab3b096e78d8118b294950… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Fixed cookie based login for installations without mcrypt bug #4469 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

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

25 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f9c6a3b0c8bd6601023139e6e9aa12fbcca0d956 https://github.com/phpmyadmin/phpmyadmin/commit/f9c6a3b0c8bd6601023139e6e9a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (2834 of 2834)

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 212195: Translated using Weblate (Azerbaijani)
by Michal Čihař 25 Jun '14

25 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 212195a253fe0c113c97af747695c5a5217f47cd https://github.com/phpmyadmin/phpmyadmin/commit/212195a253fe0c113c97af74769… Author: Sevdimali İsa <sevdimaliisayev(a)mail.ru> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M po/az.po Log Message: ----------- Translated using Weblate (Azerbaijani) Currently translated at 40.0% (1108 of 2770) Commit: c81e1acd4841607d288eb514c318b5f29f0631a0 https://github.com/phpmyadmin/phpmyadmin/commit/c81e1acd4841607d288eb514c31… Author: Weblate <noreply(a)weblate.org> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M test/classes/plugin/PMA_PluginManager_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: f0d794613d1dc23f5bb1cddecfb65f8da96f96cb https://github.com/phpmyadmin/phpmyadmin/commit/f0d794613d1dc23f5bb1cddecfb… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-25 (Wed, 25 Jun 2014) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9ad6ce3d0a5c...f0d794613d1d

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e34cd6: Translated using Weblate (Azerbaijani)
by Weblate 25 Jun '14

25 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e34cd6c50ac383d322834c96a334f9e52e4aa6a0 https://github.com/phpmyadmin/phpmyadmin/commit/e34cd6c50ac383d322834c96a33… Author: Sevdimali İsa <sevdimaliisayev(a)mail.ru> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M po/az.po Log Message: ----------- Translated using Weblate (Azerbaijani) Currently translated at 40.3% (1143 of 2834) Commit: c862cdb1efbc21ba045efe42a1a15ec694587b12 https://github.com/phpmyadmin/phpmyadmin/commit/c862cdb1efbc21ba045efe42a1a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.7% (2828 of 2834) Commit: 9ad6ce3d0a5c199a5c0a9a51756983a2ef405968 https://github.com/phpmyadmin/phpmyadmin/commit/9ad6ce3d0a5c199a5c0a9a51756… Author: Weblate <noreply(a)weblate.org> Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M test/classes/plugin/PMA_PluginManager_test.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/74e499a3d250...9ad6ce3d0a5c

1 0