Joas Schilling 36abb61d39 Merge branch '3.1.x' ...

Conflicts:
	build/build.xml

2015-05-03 18:44:34 +02:00

..

code_sniffer

…

webpi

…

build_announcement.php

…

build_changelog.php

…

build_helper.php

…

build.xml

Merge branch '3.1.x'

2015-05-03 18:44:34 +02:00

compare.sh

…

package.php

…

sami-all.conf.php

[ticket/13738] Use new branch names in sami-all.conf.php.

2015-04-02 12:30:39 +02:00

sami-checkout.conf.php

…