Merge branch 'develop-olympus' into develop

Browse Source

* develop-olympus:
  [ticket/11802] replace $browser with $user->browser

Conflicts:
	phpBB/download/file.php

...

This commit is contained in:

Andreas Fischer

2013-08-20 00:50:58 +02:00

parent c6f56f5149 7893e992ff

commit edb0f61124

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available