Merge branch 'develop-olympus' into develop

Browse Source

* develop-olympus:
  [ticket/10843] Backport changes to install language.
  [ticket/10834] Backport general development language changes to 3.0.

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html

...

This commit is contained in:

Andreas Fischer

2012-05-09 13:30:09 +02:00

parent 1a9b30b871 0488d70062

commit 1d0607cbb3

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