[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7da755: Merge remote-tracking branch 'origin/master'

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7da7552901da959cb85f921f17c6b1e49bd7b1c4 https://github.com/phpmyadmin/phpmyadmin/commit/7da7552901da959cb85f921f17c6... Author: Michal Čihař <weblate@l10n.cihar.com> Date: 2012-04-03 (Tue, 03 Apr 2012) Changed paths: M Documentation.html M js/makegrid.js M js/messages.php M libraries/display_tbl.lib.php M themes/original/css/theme_right.css.php M themes/pmahomme/css/theme_right.css.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Commit: c4a1ffa45af3f99c009733568fe2ebe9f9006ab8 https://github.com/phpmyadmin/phpmyadmin/commit/c4a1ffa45af3f99c009733568fe2... Author: Marc Delisle <marc@infomarc.info> Date: 2012-04-03 (Tue, 03 Apr 2012) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate. Commit: 169f5b5f8a1dd6e1ffd8ff0e80a88e53f9e25993 https://github.com/phpmyadmin/phpmyadmin/commit/169f5b5f8a1dd6e1ffd8ff0e80a8... Author: Berikbol Zharylkassyn <berikbolbeko@gmail.com> Date: 2012-04-04 (Wed, 04 Apr 2012) Changed paths: M po/kk.po Log Message: ----------- Translated using Weblate. Commit: 99850585e2c1069cd94008541dc3456688021d10 https://github.com/phpmyadmin/phpmyadmin/commit/99850585e2c1069cd94008541dc3... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-04-04 (Wed, 04 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 Commit: 18ab75e372798788b8341275bf4ff0e2f29305d5 https://github.com/phpmyadmin/phpmyadmin/commit/18ab75e372798788b8341275bf4f... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-04-04 (Wed, 04 Apr 2012) Changed paths: M po/fr.po M po/tr.po Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Commit: fffe0219d0a5b08a0ba8ad7863fc2ad2bcb7d427 https://github.com/phpmyadmin/phpmyadmin/commit/fffe0219d0a5b08a0ba8ad7863fc... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-04-04 (Wed, 04 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Commit: cea1ab3d0bf63bd43c6d0ecefa309648c1a9a81f https://github.com/phpmyadmin/phpmyadmin/commit/cea1ab3d0bf63bd43c6d0ecefa30... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-04-04 (Wed, 04 Apr 2012) Changed paths: M po/kk.po Log Message: ----------- Format string is here wrong Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9a5ced6...cea1ab3
participants (1)
-
Michal Čihař