[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d6cf9e: bug in server_privileges.js: cannot read property

Marc Delisle marc at infomarc.info
Fri Aug 29 15:13:52 CEST 2014


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d6cf9ebaaadf123aacca20e42e0018eb6a8a58b0
      https://github.com/phpmyadmin/phpmyadmin/commit/d6cf9ebaaadf123aacca20e42e0018eb6a8a58b0
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/server_privileges.js

  Log Message:
  -----------
  bug in server_privileges.js: cannot read property

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 6cd19738cd645aa4693b03c3a2f392cdecbeafe6
      https://github.com/phpmyadmin/phpmyadmin/commit/6cd19738cd645aa4693b03c3a2f392cdecbeafe6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/server_privileges.js

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

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/92335f8582e0...6cd19738cd64


More information about the Git mailing list