[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 392bfb: Merge remote-tracking branch 'origin/QA_3_4' into ...

Michal Čihař mcihar at suse.cz
Wed Mar 21 10:31:07 CET 2012


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 392bfb4e67e95c15236a76842d4803cfbffa2ebc
      https://github.com/phpmyadmin/phpmyadmin/commit/392bfb4e67e95c15236a76842d4803cfbffa2ebc
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5


  Commit: b81790cc81f7bba9ad0dfdd9bcabdd5b4c3f87c0
      https://github.com/phpmyadmin/phpmyadmin/commit/b81790cc81f7bba9ad0dfdd9bcabdd5b4c3f87c0
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M po/ca.po
  M po/es.po
  M po/sl.po
  M po/tr.po

  Log Message:
  -----------
  Merge remote-tracking branch 'weblate/master'

Conflicts:
	po/ca.po
	po/es.po
	po/sl.po
	po/tr.po


  Commit: a84975c06adaedfb63494e7f8496bd537e30b140
      https://github.com/phpmyadmin/phpmyadmin/commit/a84975c06adaedfb63494e7f8496bd537e30b140
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_3_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b531455...a84975c


More information about the Git mailing list