RayEhrhardt 96a86ff730 Merge remote-tracking branch 'origin/rel_3.x' into rel_4.x ... # Conflicts: # copy_this/modules/d3/d3_googleanalytics/metadata.php # copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php # copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl # setup+doku/Precheck/d3precheck.php # setup+doku/changelog.txt		2017-11-27 11:00:45 +01:00
Sources	add adblock detection in admin panel, because of blocked config pages in case of activated adblocker	2017-06-29 14:21:45 +02:00
copy_this	Merge remote-tracking branch 'origin/rel_3.x' into rel_4.x	2017-11-27 11:00:45 +01:00
setup+doku	Merge remote-tracking branch 'origin/rel_3.x' into rel_4.x	2017-11-27 11:00:45 +01:00
.gitattributes	revision adjusted	2017-03-13 12:32:27 +00:00