diff options
author | Andreas Fischer <bantu@phpbb.com> | 2013-08-20 00:50:58 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-20 00:50:58 +0200 |
commit | edb0f61124a2ea52fde7dd5500e899c60e72d883 (patch) | |
tree | 227517b852f9f619b600c15f8dec338b16ec8997 /phpBB/styles | |
parent | c6f56f51492194c7e7ec9ccb03f1fa98fecf27f8 (diff) | |
parent | 7893e992ff516eb3eb7355e591a077053e47fb12 (diff) | |
download | forums-edb0f61124a2ea52fde7dd5500e899c60e72d883.tar forums-edb0f61124a2ea52fde7dd5500e899c60e72d883.tar.gz forums-edb0f61124a2ea52fde7dd5500e899c60e72d883.tar.bz2 forums-edb0f61124a2ea52fde7dd5500e899c60e72d883.tar.xz forums-edb0f61124a2ea52fde7dd5500e899c60e72d883.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11802] replace $browser with $user->browser
Conflicts:
phpBB/download/file.php
Diffstat (limited to 'phpBB/styles')
0 files changed, 0 insertions, 0 deletions