Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2a58116a968dbf5483279244dba12070afb141c9 https://github.com/phpmyadmin/phpmyadmin/commit/2a58116a968dbf5483279244dba1... Author: Mircəlal <01youknowme@gmail.com> Date: 2014-11-06 (Thu, 06 Nov 2014) Changed paths: M po/az.po Log Message: ----------- Translated using Weblate (Azerbaijani) Currently translated at 48.3% (1338 of 2767 strings) [CI skip] Commit: 1ed62c3fcaf6445d3fbbf0d8e8bb188ad11773b7 https://github.com/phpmyadmin/phpmyadmin/commit/1ed62c3fcaf6445d3fbbf0d8e8bb... Author: Marc Delisle <marc@infomarc.info> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M ChangeLog M libraries/tbl_tracking.lib.php M test/libraries/PMA_tbl_tracking_test.php Log Message: ----------- bug Incorrect text/icon display in Tracking report Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 685b11617214ef721a6c9fe4ff18970d8177dda7 https://github.com/phpmyadmin/phpmyadmin/commit/685b11617214ef721a6c9fe4ff18... Author: Marc Delisle <marc@infomarc.info> Date: 2014-11-08 (Sat, 08 Nov 2014) Log Message: ----------- Merge commit '2a58116' Commit: 065397cd84506032911dab884d738dd65ef30145 https://github.com/phpmyadmin/phpmyadmin/commit/065397cd84506032911dab884d73... Author: Marc Delisle <marc@infomarc.info> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M ChangeLog M libraries/tracking.lib.php M test/libraries/PMA_tbl_tracking_test.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a01c75d2b784...065397cd8450