|
Oliver Schramm <oliver.schramm97@gmail.com>
|
9d75f3fca8bc94fd5f3357693e1c9df3b45e3ba1
9d75f3fca8bc94fd5f3357693e1c9df3b45e3ba1 |
Merge branch '3.0.x' into 3.1.x |
|
|
Oliver Schramm <oliver.schramm97@gmail.com>
|
407b9d3c6b95ecbb85dc6b92550d3e06db721c83
407b9d3c6b95ecbb85dc6b92550d3e06db721c83 |
Merge pull request #3506 from Nicofuma/ticket/13723-31x
[ticket/13723-Ascraeus] Add Elsensee to authors list |
|
|
Oliver Schramm <oliver.schramm97@gmail.com>
|
84d77d6cd587d8ae67e7731a00be863096336127
84d77d6cd587d8ae67e7731a00be863096336127 |
Merge pull request #3505 from Nicofuma/ticket/13723
[ticket/13723] Add Elsensee to authors list |
|
|
nicofuma
|
7f2b932a1bcfa50de6bbdb29e54ef963a1c051bd
7f2b932a1bcfa50de6bbdb29e54ef963a1c051bd |
[ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31x
Conflicts:
phpBB/docs/AUTHORS
PHPBB3-13723 |
|
|
nicofuma
|
44540b611254cd3adc428f534d5904690b7a81ef
44540b611254cd3adc428f534d5904690b7a81ef |
[ticket/13723] Add Elsensee to authors list
PHPBB3-13723 |
|