Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
georgemjohn committed Sep 30, 2019
2 parents ff4425c + e2f2afc commit 09c0f86
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"fideloper/proxy": "^4.0",
"laravel/framework": "^6.0",
"laravel/tinker": "^1.0",
"lavalite/bixo-framework": "^5.0"
"lavalite/bixo-framework": "^1.0"
},
"require-dev": {
"facade/ignition": "^1.4",
Expand Down
3 changes: 2 additions & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
|
*/

'name' => env('APP_NAME', 'Laravel'),
'name' => env('APP_NAME', 'biXo'),

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -185,6 +185,7 @@
// App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
Literp\Example\Providers\ExampleServiceProvider::class,

],

Expand Down
2 changes: 1 addition & 1 deletion resources/views/welcome.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

<div class="content">
<div class="title m-b-md">
{{config('app.name', 'BIXO')}}
{{config('app.name', 'biXo')}}
</div>

<div class="links">
Expand Down

0 comments on commit 09c0f86

Please sign in to comment.