Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 4360a174e57c78e2dee71f097389fbe48cbf1a5d
https://github.com/phpmyadmin/phpmyadmin/commit/4360a174e57c78e2dee71f097389fbe48cbf1a5d
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-11-04 (Tue, 04 Nov 2014)
Changed paths:
M ChangeLog
M js/common.js
Log Message:
-----------
bug ReferenceError: targeurl is not defined
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: f3e16baf53be92d7657f162d03b6eec3938f0adb
https://github.com/phpmyadmin/phpmyadmin/commit/f3e16baf53be92d7657f162d03b6eec3938f0adb
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-11-04 (Tue, 04 Nov 2014)
Log Message:
-----------
Merge branch 'QA_4_2'
Commit: 3ecad073258e60fd532dbdf67317552426cf9d15
https://github.com/phpmyadmin/phpmyadmin/commit/3ecad073258e60fd532dbdf67317552426cf9d15
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-11-04 (Tue, 04 Nov 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <m...@infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/3abf4138eb06...3ecad073258e------------------------------------------------------------------------------
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
