|
Andreas Fischer <bantu@phpbb.com>
|
38c5ee6eecb72563e92542c74ab7c1439f78e2de
38c5ee6eecb72563e92542c74ab7c1439f78e2de |
Merge pull request #3308 from nickvergessen/ticket/13504
[ticket/13504] Fix invalid variable $user
* nickvergessen/ticket/13504:
[ticket/13504] Fix invalid variable $user |
|
|
Nils Adermann <naderman@naderman.de>
|
e4a041fedb976f29ba85357436b55efd4cec6ba7
e4a041fedb976f29ba85357436b55efd4cec6ba7 |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/10985] Add fix to properly inherit style during update process
Conflicts:
phpBB/includes/bbcode.php |
|
|
Nils Adermann <naderman@naderman.de>
|
ebbe6a77918717c9d0897698223c1b783159d67e
ebbe6a77918717c9d0897698223c1b783159d67e |
Merge pull request #2990 from Senky/ticket/10985
[ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver |
|
|
Joas Schilling
|
7e8bb68999e6d89f84767ee03cb5ff99c8212c15
7e8bb68999e6d89f84767ee03cb5ff99c8212c15 |
[ticket/13504] Fix invalid variable $user
PHPBB3-13504 |
|
|
Senky
|
ca7f4fb5311849794957ac989e0c3090efebb66d
ca7f4fb5311849794957ac989e0c3090efebb66d |
[ticket/10985] Add fix to properly inherit style during update process
PHPBB3-10985 |
|