[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 924f25: 4.0.6-rc1

Marc Delisle marc at infomarc.info
Tue Aug 27 18:39:57 CEST 2013


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 924f2523ca2ebf80f06f5299f7381403aae528ce
      https://github.com/phpmyadmin/phpmyadmin/commit/924f2523ca2ebf80f06f5299f7381403aae528ce
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.0.6-rc1


  Commit: 4fe8bb5a5a0720b8b00c250473c88feb4e65fb77
      https://github.com/phpmyadmin/phpmyadmin/commit/4fe8bb5a5a0720b8b00c250473c88feb4e65fb77
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Log Message:
  -----------
  Merge branch 'MAINT_4_0_6' into QA_4_0


  Commit: ceb09a82fab46998f7791b119e09063e965104e2
      https://github.com/phpmyadmin/phpmyadmin/commit/ceb09a82fab46998f7791b119e09063e965104e2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.0.7-dev


  Commit: 79b3b68de73248bf546de8d2d2d665bf997067d9
      https://github.com/phpmyadmin/phpmyadmin/commit/79b3b68de73248bf546de8d2d2d665bf997067d9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Log Message:
  -----------
  Merge branch 'QA_4_0'


  Commit: 24d1315dbd698851ada47e86058c02116c31f7cd
      https://github.com/phpmyadmin/phpmyadmin/commit/24d1315dbd698851ada47e86058c02116c31f7cd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix merge conflict


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f3edd98a1522...24d1315dbd69


More information about the Git mailing list