phpBB Ascraeus

• 

  Joas Schilling 12 Nov 2014 a520edb8fa917ef86c1bc52525632ecb2392042a

  Merge branch 'develop-olympus' into develop-ascraeus
• 

  Joas Schilling 12 Nov 2014 12fd9a882759f4f88738415c11c5d15bc3bd90b8

  Merge pull request #3143 from bantu/ticket/13331-ascraeus
  [ticket/13331] Use docs target for this branch, add docs-all for all branches
• 

  Joas Schilling 12 Nov 2014 b99fbd0be05f6b8510027204d32c3a5b8e6af68c m

  Merge pull request #3142 from bantu/ticket/13331
  [ticket/13331] Use docs target for this branch, add docs-all for all branches
• 

  Andreas Fischer <bantu@phpbb.com> 12 Nov 2014 968360fed6ac614e2271942e0df4a70e66be4738

  [ticket/13331] Remove travis/sami.conf.php. Use build/sami-checkout.conf.php.
  PHPBB3-13331

  • travis/check-sami-parse-errors.sh (version 968360fed6ac614e2271942e0df4a70e66be4738)
  • travis/sami.conf.php (version 968360fed6ac614e2271942e0df4a70e66be4738)
• 

  Andreas Fischer <bantu@phpbb.com> 12 Nov 2014 01034785213435e7d90523f626694f3a9c71fb79

  Merge pull request #3142 from bantu/ticket/13331
  [ticket/13331] Use docs target for this branch, add docs-all for all branches
  
  * bantu/ticket/13331:
    [ticket/13331] Use docs target for this branch, add docs-all for dev branches.
  
  Conflicts:
          build/build.xml
          build/sami-checkout.conf.php
• 

  Andreas Fischer <bantu@phpbb.com> 12 Nov 2014 b55d744e775d548f451384422d9954309a2bc4b5 m

  [ticket/13331] Use docs target for this branch, add docs-all for dev branches.
  PHPBB3-13331

  • build/build.xml (version b55d744e775d548f451384422d9954309a2bc4b5)
  • build/sami-all.conf.php (version b55d744e775d548f451384422d9954309a2bc4b5)
  • build/sami-checkout.conf.php (version b55d744e775d548f451384422d9954309a2bc4b5)
  • build/sami.conf.php (version b55d744e775d548f451384422d9954309a2bc4b5)