Romain Neutron 7e8a34c599 Merge branch '3.8' ...

Conflicts:
	bin/developer
	build-env.sh
	composer.json
	composer.lock

2013-10-10 13:42:42 +02:00

..

apibridge.php

Merge branch '3.8'

2013-09-02 17:22:18 +02:00

archive.php

Fix archive task default settings

2013-09-14 02:10:12 +02:00

cindexer.php

Merge pull request #619 from romainneutron/sleep

2013-09-04 06:36:48 -07:00

emptyColl.php

Merge branch '3.8'

2013-09-02 17:22:18 +02:00

ftp.php

Remove debug statements

2013-09-04 14:12:56 +02:00

ftpPull.php

Remove debug statements

2013-09-04 14:12:56 +02:00

RecordMover.php

Remove dead code

2013-09-04 12:14:50 +02:00

subdef.php

Merge branch '3.8'

2013-10-03 15:29:22 +02:00

test.php

Merge branch '3.8'

2013-09-02 17:22:18 +02:00

writemeta.php

Merge branch '3.8'

2013-10-10 13:42:42 +02:00