Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e16af0866d31dc175de44c89759494313bb12b85 https://github.com/phpmyadmin/phpmyadmin/commit/e16af0866d31dc175de44c897594... Author: Diego Bemquerer Castro dbc_5@yahoo.com.br Date: 2016-08-30 (Tue, 30 Aug 2016)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.1% (2987 of 3206 strings)
[CI skip]
Commit: 7563c88c9b029c48633ecebb64be9b001df84cb3 https://github.com/phpmyadmin/phpmyadmin/commit/7563c88c9b029c48633ecebb64be... Author: Weblate noreply@weblate.org Date: 2016-08-30 (Tue, 30 Aug 2016)
Changed paths: M .gitignore
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: c9000876d5a157943ac21318f8450641c994d050 https://github.com/phpmyadmin/phpmyadmin/commit/c9000876d5a157943ac21318f845... Author: Michal Čihař michal@cihar.com Date: 2016-08-30 (Tue, 30 Aug 2016)
Changed paths: M po/pt_BR.po
Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6
Commit: bddb15b0e9b3904ac0bbc0c9556ae0304fc9c5a4 https://github.com/phpmyadmin/phpmyadmin/commit/bddb15b0e9b3904ac0bbc0c9556a... Author: Michal Čihař michal@cihar.com Date: 2016-08-30 (Tue, 30 Aug 2016)
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6'
Commit: a3d811571a9312d7125b1e79311a8399d0951a1d https://github.com/phpmyadmin/phpmyadmin/commit/a3d811571a9312d7125b1e79311a... Author: Michal Čihař michal@cihar.com Date: 2016-08-30 (Tue, 30 Aug 2016)
Changed paths: M libraries/sanitizing.lib.php
Log Message: ----------- Fix <iframe> tag
Fixes #12513
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 5c8972563a056553a0d5f76687dce87c37317eed https://github.com/phpmyadmin/phpmyadmin/commit/5c8972563a056553a0d5f76687dc... Author: Michal Čihař michal@cihar.com Date: 2016-08-30 (Tue, 30 Aug 2016)
Changed paths: M libraries/Sanitize.php
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d25ff1f4660c...5c8972563a05
-
Michal Čihař