Andreas Fischer cfeb2bec80 Merge branch 'prep-release-3.1.4' into 3.1.x ...

* prep-release-3.1.4:
  [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
  [prep-release-3.0.14] Bump version numbers for 3.0.14 release.

Conflicts:
	build/build.xml

2015-05-03 16:43:32 +02:00

..

code_sniffer

[ticket/13511] Call the check() method with the phpcsFile object

2015-01-17 00:09:06 +01:00

webpi

…

build_announcement.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

build_changelog.php

[ticket/13208] Add security issues to the final changelog

2014-10-23 12:36:27 +02:00

build_helper.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

build.xml

Merge branch 'prep-release-3.1.4' into 3.1.x

2015-05-03 16:43:32 +02:00

compare.sh

…

package.php

[ticket/13272] Add vendor/ folder to "changed files" package

2015-01-10 21:17:16 +01:00

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

[ticket/13331] Use docs target for this branch, add docs-all for dev branches.

2014-11-12 21:40:26 +01:00