Mike Ng 2c75dc654f Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589 ...

# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf

2018-01-09 09:50:27 +04:00

..

Alchemy/Phrasea

Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589

2018-01-09 09:50:27 +04:00

classes

resolve conflict

2018-01-08 15:57:13 +04:00

conf.d

Merge branch 4.0

2016-12-05 15:26:48 +01:00

autoload.php

Make autoload to return $loader instance

2015-04-08 11:41:56 +02:00