diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-02-24 00:08:13 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-02-24 00:08:13 +0000 |
| commit | 82219d51c2cbd76bedf43836f5b2e1533780bba5 (patch) | |
| tree | b0aa2e2cc7cb37b40f23da13f75ee2cfe906fbad /build/package.php | |
| parent | 4c2421dc1e7209ac9e40fe51ffb58bd637a65f73 (diff) | |
| download | forums-82219d51c2cbd76bedf43836f5b2e1533780bba5.tar forums-82219d51c2cbd76bedf43836f5b2e1533780bba5.tar.gz forums-82219d51c2cbd76bedf43836f5b2e1533780bba5.tar.bz2 forums-82219d51c2cbd76bedf43836f5b2e1533780bba5.tar.xz forums-82219d51c2cbd76bedf43836f5b2e1533780bba5.zip | |
Merge r10528 into 3.0.7: Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'build/package.php')
0 files changed, 0 insertions, 0 deletions