Daniel Seifert 47476ca025 Merge branch 'rel_1.x' of https://github.com/d3datadevelopment/TPL-development-helper into rel_1.x ... # Conflicts: # copy_this/modules/d3/d3dev/IntelliSenseHelper.php # copy_this/modules/d3/d3dev/controllers/d3dev.php # copy_this/modules/d3/d3dev/metadata.php # copy_this/modules/d3/d3dev/modules/controllers/d3_dev_thankyou.php # copy_this/modules/d3/d3dev/modules/models/d3_dev_oxemail.php		2017-05-30 16:15:30 +02:00
copy_this/modules/d3	add inquiry templates to debug	2015-12-16 17:44:47 +01:00
setup+doku	add inquiry templates to debug	2015-12-16 17:44:47 +01:00