Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fee447fae8b9b19b88985674b6a93eb73acafdf7 https://github.com/phpmyadmin/phpmyadmin/commit/fee447fae8b9b19b88985674b6a9... Author: Marc Delisle marc@infomarc.info Date: 2014-08-30 (Sat, 30 Aug 2014)

Changed paths: M ChangeLog M js/functions.js

Log Message: ----------- bug in functions.js: Cannot read property 'replace' of undefined

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 6e0189ba74fcd5b74ac77d617afafaeba51bd0f3 https://github.com/phpmyadmin/phpmyadmin/commit/6e0189ba74fcd5b74ac77d617afa... Author: Marc Delisle marc@infomarc.info Date: 2014-08-30 (Sat, 30 Aug 2014)

Changed paths: M ChangeLog M js/functions.js

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

Signed-off-by: Marc Delisle marc@infomarc.info

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/792a8d324449...6e0189ba74fc