diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-09 13:30:09 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-09 13:30:09 +0200 |
| commit | 1d0607cbb31865b5128a1a2b92b415386aee0788 (patch) | |
| tree | 58ec13e0f9bdf0acdbf0a82220b4e6257506a0b2 /phpBB/language | |
| parent | 1a9b30b87118333f0d58eaec3762fc1a579d7b8a (diff) | |
| parent | 0488d70062a3ae2ff06779dd84cbd65de0445a4d (diff) | |
| download | forums-1d0607cbb31865b5128a1a2b92b415386aee0788.tar forums-1d0607cbb31865b5128a1a2b92b415386aee0788.tar.gz forums-1d0607cbb31865b5128a1a2b92b415386aee0788.tar.bz2 forums-1d0607cbb31865b5128a1a2b92b415386aee0788.tar.xz forums-1d0607cbb31865b5128a1a2b92b415386aee0788.zip | |
Merge branch 'develop-olympus' into develop
* 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
Diffstat (limited to 'phpBB/language')
0 files changed, 0 insertions, 0 deletions