Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 4b8983028a5c1168a4c605070dc5431d086e7df8
https://github.com/phpmyadmin/phpmyadmin/commit/4b8983028a5c1168a4c605070dc5431d086e7df8
Author: Achilles-96 <raghuram.vadapa...@research.iiit.ac.in>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M libraries/tbl_common.inc.php
M tbl_export.php
Log Message:
-----------
Fixes #11679
Signed-off-by: Raghuram Vadapalli <raghuram.vadapa...@research.iiit.ac.in>
Commit: 5a77115ac5b19a07df6d24f37c78287881c8e4e7
https://github.com/phpmyadmin/phpmyadmin/commit/5a77115ac5b19a07df6d24f37c78287881c8e4e7
Author: Marc Delisle <m...@infomarc.info>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M libraries/tbl_common.inc.php
M tbl_export.php
Log Message:
-----------
Merge pull request #11738 from Achilles-96/QA_4_5
Fixes #11679
Commit: bf074566b54aa2101151f67c1e0d5daafaf5c9ea
https://github.com/phpmyadmin/phpmyadmin/commit/bf074566b54aa2101151f67c1e0d5daafaf5c9ea
Author: Marc Delisle <m...@infomarc.info>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: 0a9bdc1619cf61990bf6d42ea2ff3e7c9a9e6b9c
https://github.com/phpmyadmin/phpmyadmin/commit/0a9bdc1619cf61990bf6d42ea2ff3e7c9a9e6b9c
Author: Marc Delisle <m...@infomarc.info>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M ChangeLog
M libraries/tbl_common.inc.php
M tbl_export.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <m...@infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/3f97698382c0...0a9bdc1619cf_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git
