Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: f0aba98e35531d1a5253e70000162b2e5986e6ed
https://github.com/phpmyadmin/phpmyadmin/commit/f0aba98e35531d1a5253e70000162b2e5986e6ed
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M ChangeLog
M libraries/export.lib.php
M libraries/plugins/export/ExportSql.class.php
M libraries/plugins/export/ExportXml.class.php
Log Message:
-----------
Fix #11732 Exporting feature does not work with union table
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: d9279025f90c41ac7c55fed21cde159b740896b7
https://github.com/phpmyadmin/phpmyadmin/commit/d9279025f90c41ac7c55fed21cde159b740896b7
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M ChangeLog
M js/console.js
M po/ko.po
M po/ru.po
M po/sk.po
Log Message:
-----------
Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5
Conflicts:
ChangeLog
Commit: fd0f3d4264c2946a302e7e0968323baa561a3a41
https://github.com/phpmyadmin/phpmyadmin/commit/fd0f3d4264c2946a302e7e0968323baa561a3a41
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M ChangeLog
M libraries/export.lib.php
M libraries/plugins/export/ExportSql.php
M libraries/plugins/export/ExportXml.php
Log Message:
-----------
Merge branch 'QA_4_5'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/8956fa805a11...fd0f3d4264c2_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git
