Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ae88c8daadc79ea94b69f1833874de441dc7b21a https://github.com/phpmyadmin/phpmyadmin/commit/ae88c8daadc79ea94b69f1833874... Author: கணேஷ் குமார் GANESHTHEONE@gmail.com Date: 2014-08-25 (Mon, 25 Aug 2014)
Changed paths: M po/ta.po
Log Message: ----------- Translated using Weblate (Tamil)
Currently translated at 37.3% (1033 of 2768)
[ci skip]
Commit: 5b749b8c4cfe66b8d2a84870ab7168cf6e96d390 https://github.com/phpmyadmin/phpmyadmin/commit/5b749b8c4cfe66b8d2a84870ab71... Author: Weblate noreply@weblate.org Date: 2014-08-25 (Mon, 25 Aug 2014)
Changed paths: M ChangeLog M libraries/Table.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 2e37de57ca68740d2ee25fd6340ecfe88b63d995 https://github.com/phpmyadmin/phpmyadmin/commit/2e37de57ca68740d2ee25fd6340e... Author: Marc Delisle marc@infomarc.info Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths: M libraries/tbl_relation.lib.php M tbl_relation.php
Log Message: ----------- Fix undefined variable notice; fix parameter type
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 0241cba09bea59d29fdfae9ee319121403c1d4b7 https://github.com/phpmyadmin/phpmyadmin/commit/0241cba09bea59d29fdfae9ee319... Author: Marc Delisle marc@infomarc.info Date: 2014-08-26 (Tue, 26 Aug 2014)
Log Message: ----------- Merge commit 'ae88c8d'
Commit: 3e891622d2c48ee97a11dd0d2104db3affcb9a7d https://github.com/phpmyadmin/phpmyadmin/commit/3e891622d2c48ee97a11dd0d2104... Author: Marc Delisle marc@infomarc.info Date: 2014-08-26 (Tue, 26 Aug 2014)
Log Message: ----------- Merge commit '5b749b8'
Commit: ab46427606cdbf6818f4c6c153817a092488bb88 https://github.com/phpmyadmin/phpmyadmin/commit/ab46427606cdbf6818f4c6c15381... Author: Marc Delisle marc@infomarc.info Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths: M libraries/tbl_relation.lib.php
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/042fc65a9d8b...ab46427606cd
-
Marc Delisle