diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-20 14:53:38 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-20 14:53:38 -0400 |
| commit | 99f63f39eb8e9987669cb0c7146afc431aee1400 (patch) | |
| tree | 7066474b369d4cdc5e09d6a13101cf5284074f34 /phpBB/develop | |
| parent | 57a575b5f0e3ddd6f42ed7ee225da407044e19bc (diff) | |
| parent | d4faeb064bf7a3e97e1258d40343e83c80308024 (diff) | |
| download | forums-99f63f39eb8e9987669cb0c7146afc431aee1400.tar forums-99f63f39eb8e9987669cb0c7146afc431aee1400.tar.gz forums-99f63f39eb8e9987669cb0c7146afc431aee1400.tar.bz2 forums-99f63f39eb8e9987669cb0c7146afc431aee1400.tar.xz forums-99f63f39eb8e9987669cb0c7146afc431aee1400.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13138] Do not use cookie data and autologin while forcing a user_id
Conflicts:
phpBB/phpbb/session.php
Diffstat (limited to 'phpBB/develop')
0 files changed, 0 insertions, 0 deletions