Merge with branches

This commit is contained in:
ruben- 2015-09-22 20:51:35 +02:00
parent 6c6613106a
commit f7bde79033
13 changed files with 326 additions and 24 deletions

View file

@ -5,7 +5,7 @@
Description: Child Plugin for MainWP. The plugin is used so the installed blog can be securely managed remotely by your network. Plugin documentation and options can be found here http://docs.mainwp.com
Author: MainWP
Author URI: http://mainwp.com
Version: 2.0.28
Version: 2.0.29
*/
if ((isset($_REQUEST['heatmap']) && $_REQUEST['heatmap'] == '1') || (isset($_REQUEST['mainwpsignature']) && (!empty($_REQUEST['mainwpsignature'])))) {
header('X-Frame-Options: ALLOWALL');