Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5efab2700795d0948755f6c428070a6a8c3051e3 https://github.com/phpmyadmin/phpmyadmin/commit/5efab2700795d0948755f6c42807... Author: Michal Čihař michal@cihar.com Date: 2018-01-16 (Tue, 16 Jan 2018)

Changed paths: M libraries/pmd_common.php

Log Message: ----------- Avoid operating on unset array index

Fixes #13939

Signed-off-by: Michal Čihař michal@cihar.com

Commit: f3eed2de4e9ad1d416357e7b2f57969c033b5a01 https://github.com/phpmyadmin/phpmyadmin/commit/f3eed2de4e9ad1d416357e7b2f57... Author: Microgamer Developer microgamer.developer@gmail.com Date: 2018-01-22 (Mon, 22 Jan 2018)

Changed paths: M po/de.po

Log Message: ----------- Translated using Weblate (German)

Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]

Commit: 849528521ebe9a6506ecd9dd0dd2c07eb2f54adc https://github.com/phpmyadmin/phpmyadmin/commit/849528521ebe9a6506ecd9dd0dd2... Author: yanagimoto yanagimoto@klink.co.jp Date: 2018-01-22 (Mon, 22 Jan 2018)

Changed paths: M po/ja.po

Log Message: ----------- Translated using Weblate (Japanese)

Currently translated at 70.3% (2256 of 3207 strings)

[CI skip]

Commit: dcc13ddc50a1456858bed55e09a24d07c35b31c7 https://github.com/phpmyadmin/phpmyadmin/commit/dcc13ddc50a1456858bed55e09a2... Author: Michal Čihař michal@cihar.com Date: 2018-01-22 (Mon, 22 Jan 2018)

Changed paths: M composer.json

Log Message: ----------- Clatify license in composer.json

We are still GPL-2.0 only, so document that properly.

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 3ca15a5e6017b5f5a72f08085830e3f53d9cc7f0 https://github.com/phpmyadmin/phpmyadmin/commit/3ca15a5e6017b5f5a72f08085830... Author: Michal Čihař michal@cihar.com Date: 2018-01-22 (Mon, 22 Jan 2018)

Changed paths: M libraries/classes/PmdCommon.php

Log Message: ----------- Merge commit '5efab2700795d0948755f6c428070a6a8c3051e3'

Commit: 03eae99ede7927b5c58027a9237a543d6a9eca05 https://github.com/phpmyadmin/phpmyadmin/commit/03eae99ede7927b5c58027a9237a... Author: Michal Čihař michal@cihar.com Date: 2018-01-22 (Mon, 22 Jan 2018)

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7'

Commit: 62405807844f7f70af99fd5d2cf872f9a5cf8b55 https://github.com/phpmyadmin/phpmyadmin/commit/62405807844f7f70af99fd5d2cf8... Author: Michal Čihař michal@cihar.com Date: 2018-01-22 (Mon, 22 Jan 2018)

Changed paths: M composer.json

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/aab03be7e611...62405807844f