Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: eab5d68b9dcc037713f940a0d2bca1b39bdfbe30 https://github.com/phpmyadmin/phpmyadmin/commit/eab5d68b9dcc037713f940a0d2bc... Author: Michal Čihař michal@cihar.com Date: 2014-03-19 (Wed, 19 Mar 2014)

Changed paths: M libraries/Header.class.php

Log Message: ----------- Fix typo in CSP

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 80e466a58dfad26a0ca8cc3c5b16c4ac7e751dfe https://github.com/phpmyadmin/phpmyadmin/commit/80e466a58dfad26a0ca8cc3c5b16... Author: Michal Čihař michal@cihar.com Date: 2014-03-19 (Wed, 19 Mar 2014)

Changed paths: M libraries/Header.class.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a415e6c5c128...80e466a58dfa