diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-27 19:04:01 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-27 19:04:01 -0700 |
| commit | b9c08cddd47b39355458e828d847c34ab0e8c378 (patch) | |
| tree | 87460fd5cc43eb75ecce8c447a9eaa4e25a01cfc /phpBB/phpbb/controller/exception.php | |
| parent | 4c75f013de1040bf74886de1c1a6d4b83e2e8453 (diff) | |
| parent | efe3aaaf0b9b2f60da89df0e285dace91f24cea1 (diff) | |
| download | forums-b9c08cddd47b39355458e828d847c34ab0e8c378.tar forums-b9c08cddd47b39355458e828d847c34ab0e8c378.tar.gz forums-b9c08cddd47b39355458e828d847c34ab0e8c378.tar.bz2 forums-b9c08cddd47b39355458e828d847c34ab0e8c378.tar.xz forums-b9c08cddd47b39355458e828d847c34ab0e8c378.zip | |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
[ticket/13227] Properly handle curlwrapper headers in remote avatars
[ticket/13231] Update the dependencies of the migration contact_admin_form
Diffstat (limited to 'phpBB/phpbb/controller/exception.php')
0 files changed, 0 insertions, 0 deletions