Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0fc00c0ab895cf83883ce43435f9563019e1b0f5
      
https://github.com/phpmyadmin/phpmyadmin/commit/0fc00c0ab895cf83883ce43435f9563019e1b0f5
  Author: Isaac Bennetch <benne...@gmail.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

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

  Log Message:
  -----------
  4.6.0-rc2 release

Signed-off-by: Isaac Bennetch <benne...@gmail.com>


  Commit: 5125fc3bc04e541f9e5fa133d2cdd41a5267f789
      
https://github.com/phpmyadmin/phpmyadmin/commit/5125fc3bc04e541f9e5fa133d2cdd41a5267f789
  Author: Isaac Bennetch <benne...@gmail.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/Util.php
    M libraries/core.lib.php
    M libraries/session.inc.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6


  Commit: dd5662977b4292e14cf13a639af5c827c20726de
      
https://github.com/phpmyadmin/phpmyadmin/commit/dd5662977b4292e14cf13a639af5c827c20726de
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2016-03-02 (Wed, 02 Mar 2016)

  Log Message:
  -----------
  Merge branch 'QA_4_6'

Conflicts:
        README
        doc/conf.py
        libraries/Config.php


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/a0df0f15c1f2...dd5662977b42
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to