|
Joas Schilling
|
262e403e8e62366737f20f0cb0a757ea359219ca
262e403e8e62366737f20f0cb0a757ea359219ca |
Merge branch '3.0.x' into 3.1.x
Conflicts:
documentation/content/en/chapters/upgrade_guide.xml |
|
|
Joas Schilling
|
56ffc5e73aa36d3ca69297299dac890b7b6b386a
56ffc5e73aa36d3ca69297299dac890b7b6b386a |
Merge branch 'backport-47' into 3.0.x |
|
|
phpBB España <thekuka@gmail.com>
|
ffd7be5b3bc27dc50066db79d0d9aca4e7dc5c78
ffd7be5b3bc27dc50066db79d0d9aca4e7dc5c78 |
Small language error.
Conflicts:
documentation/content/en/chapters/upgrade_guide.xml |
|