Merge branch 'develop' into feature/requiredFields
authorAlex Kellner <alexander.kellner@in2code.de>
Mon, 10 Mar 2014 12:20:03 +0000 (13:20 +0100)
committerAlex Kellner <alexander.kellner@in2code.de>
Mon, 10 Mar 2014 12:20:03 +0000 (13:20 +0100)
1  2 
ext_emconf.php

diff --cc ext_emconf.php
Simple merge