Daniel Seifert 9fe3684892 Merge branch 'rel_ionCube_PHP56-70' of github.com:d3datadevelopment/contenttabs into rel_ionCube_PHP56-70 ... # Conflicts: # README.md # changelog.md # composer.json # docs/Precheck/d3precheck.php # docs/Precheck/modules/d3/contenttabs/Application/Controller/Admin/d3precheckinfolder.php # docs/Precheck/modules/d3/contenttabs/Setup/d3precheckinfolder.php # docs/Precheck/modules/d3/contenttabs/d3precheckinfolder.php # src/Application/Controller/Admin/contentTabList.php # src/Application/Controller/Admin/contentTabs.php # src/Application/Controller/Admin/settings.php # src/Application/Controller/Admin/support.php # src/Application/Model/contentTabs.php # src/Application/translations/de/d3_contenttabs_lang.php # src/Application/views/admin/de/d3_contenttabs_lang.php # src/Application/views/admin/tpl/contentTabList.tpl # src/Application/views/admin/tpl/contentTabs.tpl # src/IntelliSenseHelper.php # src/Setup/setupWizard.php # src/menu.xml # src/metadata.php # src/modules/Application/Component/Widget/d3_oxwarticledetails_contenttabs.php # src/modules/Application/Model/d3_oxarticle_longtexts.php		2018-10-19 15:53:55 +02:00
..
d3_oxwarticledetails_contenttabs.php	Merge branch 'rel_ionCube_PHP56-70' of github.com:d3datadevelopment/contenttabs into rel_ionCube_PHP56-70	2018-10-19 15:53:55 +02:00