phpBB Ascraeus

• 

  Andreas Fischer <bantu@phpbb.com> 19 Jan 2015 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> 19 Jan 2015 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> 19 Jan 2015 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 19 Jan 2015 7e8bb68999e6d89f84767ee03cb5ff99c8212c15

  [ticket/13504] Fix invalid variable $user
  PHPBB3-13504

  • phpBB/phpbb/search/fulltext_native.php (version 7e8bb68999e6d89f84767ee03cb5ff99c8212c15)
• 

  Senky 23 Sep 2014 ca7f4fb5311849794957ac989e0c3090efebb66d

  [ticket/10985] Add fix to properly inherit style during update process
  PHPBB3-10985

  • phpBB/includes/bbcode.php (version ca7f4fb5311849794957ac989e0c3090efebb66d)