Nils Adermann 1c6ebcf02b Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [prep-release-3.0.13] Bump version numbers for 3.0.13 release
  [prep-release-3.0.13] Highlight security relevant changes

Conflicts:
	build/build.xml
	phpBB/install/database_update.php

2015-01-26 19:01:34 +01:00

..

code_sniffer

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

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

webpi

[ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.

2010-11-19 11:27:16 +01:00

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 'develop-olympus' into develop-ascraeus

2015-01-26 19:01:34 +01:00

compare.sh

Merge r10549 into 3.0.7: After generating all packages go through the full installs and make sure the files do not contain any errors [Bug #58255]

2010-02-27 22:08:43 +00:00

package.php

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

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

sami-all.conf.php

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

2014-11-12 21:40:26 +01: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