diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-12-27 14:09:38 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-12-27 14:09:38 +0100 |
| commit | cf8904bc2c8f71af734feea95a5fba8272a8341a (patch) | |
| tree | 6de1075728ba549c836edca9fd327da0f6e1ec93 /phpBB/phpbb/db/driver/mssql.php | |
| parent | 8049b5fd97a58fdf6b654d6d881450808ff5bf84 (diff) | |
| parent | ffbe1d424b831e0679df69565f14b1315635aa41 (diff) | |
| download | forums-cf8904bc2c8f71af734feea95a5fba8272a8341a.tar forums-cf8904bc2c8f71af734feea95a5fba8272a8341a.tar.gz forums-cf8904bc2c8f71af734feea95a5fba8272a8341a.tar.bz2 forums-cf8904bc2c8f71af734feea95a5fba8272a8341a.tar.xz forums-cf8904bc2c8f71af734feea95a5fba8272a8341a.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/mcp_front.html
Diffstat (limited to 'phpBB/phpbb/db/driver/mssql.php')
0 files changed, 0 insertions, 0 deletions