Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: eb29af585aa2a8a6f731778e859e19869fdf5366 https://github.com/phpmyadmin/phpmyadmin/commit/eb29af585aa2a8a6f731778e859e... Author: Michal Čihař michal@cihar.com Date: 2013-06-05 (Wed, 05 Jun 2013)

Changed paths: M doc/config.rst M libraries/Header.class.php M libraries/config.default.php

Log Message: ----------- Allow customization of CSP headers

This is useful for inserting custom javascript in header/footer files.

Commit: bfa628208302254d8b250463ec0524123c41c3bf https://github.com/phpmyadmin/phpmyadmin/commit/bfa628208302254d8b250463ec05... Author: Michal Čihař michal@cihar.com Date: 2013-06-05 (Wed, 05 Jun 2013)

Changed paths: M doc/config.rst M libraries/Header.class.php M libraries/config.default.php

Log Message: ----------- Merge branch 'QA_4_0'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bc0bd0281c95...bfa628208302