Ingo Schommer c55c7c33f8 Merge branch '3.0' ...

Conflicts:
	admin/code/CMSProfileController.php
	composer.json
	tests/model/DataObjectTest.php

2012-11-22 23:51:28 +01:00

..

i18n.php

Merge branch '3.0'

2012-11-22 23:51:28 +01:00

i18nEntityProvider.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

i18nRailsYamlAdapter.php

MINOR Fixed phpdocs

2012-06-20 23:59:16 +02:00

i18nSSLegacyAdapter.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

i18nTextCollector.php

BUG Fixed issue with Deprecation failing to extract the module from a stacktrace, especially on non-unix systems

2012-10-17 11:57:16 +13:00

i18nTranslateAdapterInterface.php

MINOR Fixed phpdocs

2012-06-20 23:59:16 +02:00