[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 312ff2: [bugs:#4694] js error on marking table as favorite...

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 312ff22ee5202c7d15c677af62ebe86a3c2c3e5e https://github.com/phpmyadmin/phpmyadmin/commit/312ff22ee5202c7d15c677af62e… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2015-01-08 (Thu, 08 Jan 2015) Changed paths: M ChangeLog M js/functions.js M js/messages.php M js/navigation.js Log Message: ----------- [bugs:#4694] js error on marking table as favorite in Safari (in private mode) Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Commit: 727c35a6577ed145010134fca6d1ff32ff32dd7b https://github.com/phpmyadmin/phpmyadmin/commit/727c35a6577ed145010134fca6d… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2015-01-08 (Thu, 08 Jan 2015) Changed paths: M ChangeLog M js/functions.js M js/messages.php M js/navigation.js Log Message: ----------- Merge branch 'QA_4_3' Conflicts: js/functions.js Compare: https://github.com/phpmyadmin/phpmyadmin/compare/57b8e0c13825...727c35a6577e