Branch: refs/heads/QA_3_5
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 9c8c9e88fca471d63c9c3d0d50575c908b243303
https://github.com/phpmyadmin/phpmyadmin/commit/9c8c9e88fca471d63c9c3d0d505…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2012-02-18 (Sat, 18 Feb 2012)
Changed paths:
M ChangeLog
Log Message:
-----------
[security] XSS in replication setup, see PMASA-2012-1
Commit: 67d9eca21dfbfcb764bc053293a959e5a560bb3e
https://github.com/phpmyadmin/phpmyadmin/commit/67d9eca21dfbfcb764bc053293a…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2012-02-18 (Sat, 18 Feb 2012)
Changed paths:
M ChangeLog
M js/replication.js
Log Message:
-----------
Fix merge conflicts
Commit: 33635fbe191204879492f2cf12d9584bd6726fc1
https://github.com/phpmyadmin/phpmyadmin/commit/33635fbe191204879492f2cf12d…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2012-02-18 (Sat, 18 Feb 2012)
Changed paths:
M ChangeLog
M js/replication.js
Log Message:
-----------
Merge branch 'QA_3_4' into QA_3_5
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/ff11bfb...33635fb