Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Laralum/Blog
Browse files Browse the repository at this point in the history
  • Loading branch information
24aitor committed May 15, 2017
2 parents 38520dd + ce2a951 commit ffad2da
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Controllers/PostController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
use GrahamCampbell\Markdown\Facades\Markdown;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Laralum\Users\Models\User;
use Laralum\Blog\Models\Category;
use Laralum\Blog\Models\Post;
use Laralum\Blog\Models\Settings;
use Laralum\Users\Models\User;

class PostController extends Controller
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?php

use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\Schema;

class AddPublicColumnLaralumBlog extends Migration
{
Expand Down

0 comments on commit ffad2da

Please sign in to comment.