Skip to content

Commit

Permalink
Merge branch 'upstream/1.0/develop' into 3.0/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Thompson committed Apr 3, 2015
2 parents 62fde9c + ef8d231 commit d51f628
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions config/streams.php
Expand Up @@ -2,6 +2,21 @@

return [

/*
|--------------------------------------------------------------------------
| Application Information
|--------------------------------------------------------------------------
|
| This is used as the default application name / description / logo.
|
*/

'app' => [
'name' => 'Streams',
'description' => 'Streams is an abstracted and modular platform for developing web applications.',
'logo' => 'theme::img/logo.png'
],

/*
|--------------------------------------------------------------------------
| Addon Types
Expand Down

0 comments on commit d51f628

Please sign in to comment.