- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 9145fc: Test reading of compressed files
by Michal Čihař 11 Apr '16

11 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9145fc7dae5f887335102436b2d83fbede2153ab https://github.com/phpmyadmin/phpmyadmin/commit/9145fc7dae5f887335102436b2d… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M test/classes/FileTest.php Log Message: ----------- Test reading of compressed files Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 0b27b843eba774419d1e1d758a9b19d1dff92aa1 https://github.com/phpmyadmin/phpmyadmin/commit/0b27b843eba774419d1e1d758a9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/File.php Log Message: ----------- We should use bytes for file length Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d4fdb956193d...0b27b843eba7

1 0

[phpmyadmin/phpmyadmin] b54e5b: Use File class for file imports
by Michal Čihař 11 Apr '16

11 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b54e5b0c4b600df9c88295e437e362ee005c7434 https://github.com/phpmyadmin/phpmyadmin/commit/b54e5b0c4b600df9c88295e437e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M import.php M libraries/File.php M libraries/import.lib.php Log Message: ----------- Use File class for file imports Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b4d53c1970f2ad27e0ae4074e65d9a9018b7cd58 https://github.com/phpmyadmin/phpmyadmin/commit/b4d53c1970f2ad27e0ae4074e65… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/File.php Log Message: ----------- Bring back move uploaded file logic from old import code Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f90ca55a574ded2120488b9e11582c2e381faec4 https://github.com/phpmyadmin/phpmyadmin/commit/f90ca55a574ded2120488b9e115… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M import.php Log Message: ----------- Add missing error check Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e408163aedaa46109acd0e2dd5fa4d9773a46ac8 https://github.com/phpmyadmin/phpmyadmin/commit/e408163aedaa46109acd0e2dd5f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M ChangeLog M libraries/File.php Log Message: ----------- Improve performance of zip file import Avoid doing copies for every import chunk, rather use mb_strcut which allows us to parse stream by bytes, but doesn't cut multibyte chars. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e068339e90c910a0832618305c6f8ffb9498ddf6 https://github.com/phpmyadmin/phpmyadmin/commit/e068339e90c910a0832618305c6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/import.lib.php Log Message: ----------- Fix import handle cleanup on error Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: bf2c76c1b1cc1504d381850e8e7d2cbd0066231b https://github.com/phpmyadmin/phpmyadmin/commit/bf2c76c1b1cc1504d381850e8e7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/plugins/import/ImportLdi.php M libraries/plugins/import/ImportShp.php M test/classes/plugin/import/ImportCsvTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportMediawikiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/classes/plugin/import/ImportShpTest.php M test/classes/plugin/import/ImportSqlTest.php M test/classes/plugin/import/ImportXmlTest.php Log Message: ----------- Adjust tests to new import code Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2c9deb0b62c300b45cae42ff4c74e42b0dd7514c https://github.com/phpmyadmin/phpmyadmin/commit/2c9deb0b62c300b45cae42ff4c7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/plugins/import/ImportShp.php Log Message: ----------- Check zip file processing for errors Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 29fe4d12af0fabc9e97dbc5842c89cc5275b5f60 https://github.com/phpmyadmin/phpmyadmin/commit/29fe4d12af0fabc9e97dbc5842c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M test/classes/plugin/import/ImportShpTest.php Log Message: ----------- Check import status in testcase Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d4fdb956193df710d5589254ca40aeb58e529b82 https://github.com/phpmyadmin/phpmyadmin/commit/d4fdb956193df710d5589254ca4… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/File.php M libraries/plugins/import/ImportShp.php Log Message: ----------- Adjust SHP file import to new code Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9182a4d3a1f9...d4fdb956193d

1 0

[phpmyadmin/phpmyadmin] 9182a4: Move error checking to the Config class
by Michal Čihař 11 Apr '16

11 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9182a4d3a1f90eb1502f7a790fcddd168881c6ef https://github.com/phpmyadmin/phpmyadmin/commit/9182a4d3a1f90eb1502f7a790fc… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/Config.php M libraries/common.inc.php Log Message: ----------- Move error checking to the Config class Also fix not working checking error on the defaults. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 14910a: Update po files
by Michal Čihař 11 Apr '16

11 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 14910ac2bac7775e8da171cd236e33e0ddc470aa https://github.com/phpmyadmin/phpmyadmin/commit/14910ac2bac7775e8da171cd236… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) 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/brx.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/eo.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/fy.po M po/gl.po M po/gu.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/li.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/ne.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/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [CI skip] Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] a7a44c: All charsets/collation we get from the MySQL serve...
by Michal Čihař 11 Apr '16

11 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a7a44c28c59641637585f38eda3070c070c39d5f https://github.com/phpmyadmin/phpmyadmin/commit/a7a44c28c59641637585f38eda3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/Charsets.php M libraries/controllers/server/ServerCollationsController.php M templates/server/collations/charsets.phtml Log Message: ----------- All charsets/collation we get from the MySQL server are available There is no need for explicit checking for availability later in the code. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6429689607e04a22a4189b55edab8c59ff53991c https://github.com/phpmyadmin/phpmyadmin/commit/6429689607e04a22a4189b55eda… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/Charsets.php Log Message: ----------- Simplify collations reading Remove dependency from charsets to collations, we really do not need it. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9a59032379430246b7e46adc52fddf087d663da9 https://github.com/phpmyadmin/phpmyadmin/commit/9a59032379430246b7e46adc52f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/Charsets.php M test/classes/CharsetsTest.php M test/libraries/PMA_operations_test.php Log Message: ----------- Improve collation descriptions - detect new languages - detect new Unicode variants - better describe collation method Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b311780d76eb...9a5903237943

1 0

[phpmyadmin/phpmyadmin] cd4008: Move MySQL charset maps to separate class
by Michal Čihař 11 Apr '16

11 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cd4008b3d72c0f95c4de736ce359ca5771272e3b https://github.com/phpmyadmin/phpmyadmin/commit/cd4008b3d72c0f95c4de736ce35… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M index.php A libraries/Charsets.php M libraries/common.inc.php M libraries/plugins/export/ExportSql.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Move MySQL charset maps to separate class This allows us to load it only when needed Issue #11731 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: cfc2f1cb05331b85c1c075ca2037c09626573903 https://github.com/phpmyadmin/phpmyadmin/commit/cfc2f1cb05331b85c1c075ca203… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M index.php M libraries/Charsets.php M libraries/controllers/server/ServerCollationsController.php M libraries/mysql_charsets.inc.php Log Message: ----------- Move charsets obtaining to the Charsets class Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 54f0d14ea9bdd2d3420afcdd470c2fe94c1bfaa9 https://github.com/phpmyadmin/phpmyadmin/commit/54f0d14ea9bdd2d3420afcdd470… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/Charsets.php Log Message: ----------- Remove session caching for MySQL charsets This cache makes the session data quite huge giving performance penalty when loading the cache. Loading the data again from MySQL server is faster than this. Also the charsets data is really needed only on few pages, the overall impact of this caching is negative. Caching the data per request however is useful. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e1db0a72cffc78c91d88a00c1a3f45e2da6d58a3 https://github.com/phpmyadmin/phpmyadmin/commit/e1db0a72cffc78c91d88a00c1a3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/Charsets.php Log Message: ----------- Remove unused code Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d30bb0581cd7052296e999c6bee6808951b573b6 https://github.com/phpmyadmin/phpmyadmin/commit/d30bb0581cd7052296e999c6bee… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/Charsets.php Log Message: ----------- Load collations only when needed In many cases we need only charset information, so split the loading. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a8820cbd4ecc49652511f4c1c0f765138a059b84 https://github.com/phpmyadmin/phpmyadmin/commit/a8820cbd4ecc49652511f4c1c0f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/Charsets.php Log Message: ----------- Remove not needed mysql prefix from static variables Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f9a02cde3034600544e265e1ca03b0a4ef9b2f77 https://github.com/phpmyadmin/phpmyadmin/commit/f9a02cde3034600544e265e1ca0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/Charsets.php Log Message: ----------- Simplify code by storing frequently used array members in variable Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 1fe277e98884cbd4cffddecd143eb86491871908 https://github.com/phpmyadmin/phpmyadmin/commit/1fe277e98884cbd4cffddecd143… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Use $this instead of accessing DBI from globals We're already in the object scope, there is no need to go to globals for self. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e2deac4b22e2a960d99819cc8e3520cceb4d3c3c https://github.com/phpmyadmin/phpmyadmin/commit/e2deac4b22e2a960d99819cc8e3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M db_operations.php M libraries/DatabaseInterface.php M libraries/controllers/database/DatabaseStructureController.php M libraries/controllers/server/ServerDatabasesController.php M libraries/mysql_charsets.lib.php M libraries/plugins/export/ExportSql.php M test/classes/DatabaseInterfaceTest.php M test/libraries/PMA_mysql_charsets_test.php Log Message: ----------- Move getting collation to the DBI layer Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: be69b146f749b3dbfc74252252f0baf9e062b12c https://github.com/phpmyadmin/phpmyadmin/commit/be69b146f749b3dbfc74252252f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/operations.lib.php Log Message: ----------- Use just class name for already used classes Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 0758b601e752e159174e3226b3e65540626aa9a0 https://github.com/phpmyadmin/phpmyadmin/commit/0758b601e752e159174e3226b3e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/Table.php M libraries/Util.php M libraries/controllers/server/ServerDatabasesController.php M libraries/create_addfield.lib.php M libraries/db_common.inc.php M libraries/mysql_charsets.lib.php M libraries/operations.lib.php M test/classes/UtilTest.php M test/libraries/PMA_mysql_charsets_test.php Log Message: ----------- Move charset query generation to to the Util class Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 72099ff05a25c092f52dfd4c36fa1fa826c43df1 https://github.com/phpmyadmin/phpmyadmin/commit/72099ff05a25c092f52dfd4c36f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/dbi/DBIMysqli.lib.php R libraries/mysql_charsets.inc.php R libraries/mysql_charsets.lib.php R test/libraries/PMA_mysql_charsets_test.php Log Message: ----------- Ensure this is always defined in the global scope Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3e2029e7505c684066d76d3a2f5ad5ad7948b541 https://github.com/phpmyadmin/phpmyadmin/commit/3e2029e7505c684066d76d3a2f5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M db_operations.php M db_routines.php M index.php M libraries/Charsets.php M libraries/DatabaseInterface.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/database/DatabaseStructureController.php M libraries/controllers/server/ServerCollationsController.php M libraries/controllers/server/ServerDatabasesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/dbi/DBIDummy.php M libraries/display_import.lib.php M libraries/operations.lib.php M libraries/rte/rte_routines.lib.php M libraries/tbl_columns_definition_form.inc.php M tbl_operations.php M tbl_row_action.php M tbl_structure.php M templates/columns_definitions/column_attributes.phtml M templates/columns_definitions/column_definitions_form.phtml M templates/database/structure/body_for_table_summary.phtml M templates/server/collations/charsets.phtml M templates/server/databases/create.phtml M templates/table/structure/row_stats_table.phtml M templates/table/structure/table_structure_row.phtml A test/classes/CharsetsTest.php M test/classes/TableTest.php M test/classes/controllers/ServerCollationsControllerTest.php M test/classes/controllers/ServerDatabasesControllerTest.php M test/classes/plugin/export/ExportSqlTest.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_normalization_test.php M test/libraries/PMA_operations_test.php M test/libraries/PMA_sql_query_form_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- Move MySQL charsets handling to the Charsets class Issue #11731 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b311780d76eb69c75d8fae7f05139fa45b53b8e6 https://github.com/phpmyadmin/phpmyadmin/commit/b311780d76eb69c75d8fae7f051… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M index.php M libraries/Charsets.php M libraries/central_columns.lib.php M libraries/display_import.lib.php M libraries/operations.lib.php M libraries/rte/rte_routines.lib.php M templates/columns_definitions/column_attributes.phtml M templates/columns_definitions/column_definitions_form.phtml M templates/server/databases/create.phtml M test/classes/CharsetsTest.php Log Message: ----------- Separate methods for charset and collation dropdowns They do not share much code in the end and this way the code is more readable. Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3e8145a4a580...b311780d76eb

1 0

[phpmyadmin/phpmyadmin] 3e8145: Remove unused variable mysql_collations_flat
by Michal Čihař 11 Apr '16

11 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3e8145a4a580ab91c83058ec54e1c8dc2d94c65b https://github.com/phpmyadmin/phpmyadmin/commit/3e8145a4a580ab91c83058ec54e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/common.inc.php M libraries/mysql_charsets.inc.php Log Message: ----------- Remove unused variable mysql_collations_flat Issue #11731 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] fb5b68: Remove checks for older PHP versions
by Michal Čihař 11 Apr '16

11 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fb5b68192526b4b18674304d5d07a822a05f664d https://github.com/phpmyadmin/phpmyadmin/commit/fb5b68192526b4b18674304d5d0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M import_status.php M libraries/plugins/export/ExportJson.php Log Message: ----------- Remove checks for older PHP versions We require 5.5, so there is no need to check for >= 5.4 or similar. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] a62fda: Fix typo
by Michal Čihař 11 Apr '16

11 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a62fdaa22310166d8ae4756ab354c033aade5ed2 https://github.com/phpmyadmin/phpmyadmin/commit/a62fdaa22310166d8ae4756ab35… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M doc/faq.rst Log Message: ----------- Fix typo [CI skip] Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 08a23a: Translated using Weblate (Chinese (Taiwan))
by Weblate 11 Apr '16

11 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 08a23a8406d69d1c257d10c55e343e328aeaf546 https://github.com/phpmyadmin/phpmyadmin/commit/08a23a8406d69d1c257d10c55e3… Author: Ming Tsay <mt(a)moztw.org> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M po/zh_TW.po Log Message: ----------- Translated using Weblate (Chinese (Taiwan)) Currently translated at 97.8% (3146 of 3214 strings) [CI skip] Commit: 95890fa89587152026e42e1a0a53eca8979e40bc https://github.com/phpmyadmin/phpmyadmin/commit/95890fa89587152026e42e1a0a5… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3214 of 3214 strings) [CI skip] Commit: 53db60e190e29640196aa25c512c23b87c3d2df0 https://github.com/phpmyadmin/phpmyadmin/commit/53db60e190e29640196aa25c512… Author: Weblate <noreply(a)weblate.org> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M doc/faq.rst Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1cbfcfc7b05c...53db60e190e2

1 0