Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 7eebe49fd7edc6adab831ede53b9505c033dd350
https://github.com/phpmyadmin/phpmyadmin/commit/7eebe49fd7edc6adab831ede53b…
Author: ayushchd <ayushchd(a)gmail.com>
Date: 2013-08-04 (Sun, 04 Aug 2013)
Changed paths:
M test/classes/plugin/export/PMA_ExportOds_test.php
Log Message:
-----------
Fix test case for date issue
Commit: c823778b47c49952dbd983766967dfab339e0e80
https://github.com/phpmyadmin/phpmyadmin/commit/c823778b47c49952dbd98376696…
Author: ayushchd <ayushchd(a)gmail.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M libraries/Footer.class.php
M po/id.po
M po/nl.po
M tbl_tracking.php
A test/libraries/PMA_server_variables_test.php
Log Message:
-----------
Resolve merge conflict
Commit: 6caccf9d1f91903b4a1b3b7439f25300761fcdc4
https://github.com/phpmyadmin/phpmyadmin/commit/6caccf9d1f91903b4a1b3b7439f…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M test/classes/plugin/export/PMA_ExportOds_test.php
Log Message:
-----------
Merge pull request #565 from ayushchd/unit_testing_2
Fix test case for date issue
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/95fc4d1c763c...6caccf9d1f91