Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d6cf9ebaaadf123aacca20e42e0018eb6a8a58b0 https://github.com/phpmyadmin/phpmyadmin/commit/d6cf9ebaaadf123aacca20e42e00... Author: Marc Delisle marc@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@infomarc.info

Commit: 6cd19738cd645aa4693b03c3a2f392cdecbeafe6 https://github.com/phpmyadmin/phpmyadmin/commit/6cd19738cd645aa4693b03c3a2f3... Author: Marc Delisle marc@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@infomarc.info

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