diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-08 15:06:46 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-08 15:06:46 +0200 |
| commit | 6bfadd86edb7b0793f8c943bade7c36e4f89adac (patch) | |
| tree | 061805a8ab6a3fba4c27d829daa3b135f9cb1791 /phpBB/phpbb/db/driver/mssql.php | |
| parent | 55c21834ad08a99a8c4b1f24d64a74edd4c9612d (diff) | |
| parent | 44a0f43062ea63ebb5cc5cdfa500934987b85cde (diff) | |
| download | forums-6bfadd86edb7b0793f8c943bade7c36e4f89adac.tar forums-6bfadd86edb7b0793f8c943bade7c36e4f89adac.tar.gz forums-6bfadd86edb7b0793f8c943bade7c36e4f89adac.tar.bz2 forums-6bfadd86edb7b0793f8c943bade7c36e4f89adac.tar.xz forums-6bfadd86edb7b0793f8c943bade7c36e4f89adac.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12789] Move duplicated functions to the base class
[ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()
Conflicts:
phpBB/phpbb/cache/driver/file.php
phpBB/phpbb/cache/driver/memory.php
Diffstat (limited to 'phpBB/phpbb/db/driver/mssql.php')
0 files changed, 0 insertions, 0 deletions