Joas Schilling
0682e5719d55a10485050dc1fc7561c32e6b3fb8
0682e5719d55a10485050dc1fc7561c32e6b3fb8
Merge branch 'prep-release-3.1.0' into develop-ascraeus
28 Oct 2014
Joas Schilling
679559ce180ec5210edb3a019e9ca862d7fddf4e
m 679559ce180ec5210edb3a019e9ca862d7fddf4e
Merge branch 'naderman-ticket/13232' into prep-release-3.1.0
28 Oct 2014
Joas Schilling
2e814cc43fe8194e496c743f576b55feadbc3812
m 2e814cc43fe8194e496c743f576b55feadbc3812
[ticket/13232] Fix spaces vs tabs
PHPBB3-13232
28 Oct 2014
Nils Adermann <naderman@naderman.de>
dccbd573e8010a30f0876c03f0e7150e2a377938
m dccbd573e8010a30f0876c03f0e7150e2a377938
[ticket/13232] Ensure prune cron job always gets run in prune test
The cron scheduler might pick a different task but we don't want to go
through them all to find the one we need. So we just make sure cron is
run at all and then manually run the one we want.
PHPBB3-13232
28 Oct 2014
Nils Adermann <naderman@naderman.de>
dbaee1a5dad8fd90322b1649206ce22073a10fd4
m dbaee1a5dad8fd90322b1649206ce22073a10fd4
Merge pull request #4 from nickvergessen/naderman-ticket/13232
[ticket/13232] Fix more issues with TTL and global cache file
27 Oct 2014