Merge remote-tracking branch 'origin/0.8'

Conflicts: app/Seeds/page-home.md
demonchung · Jan 11, 2015 · f1e2ad0 · f1e2ad0
2 parents c239d10 + b8f89d1
commit f1e2ad0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/Seeds/page-home.md b/app/Seeds/page-home.md
@@ -33,15 +33,15 @@
 
     <div class="col-md-4 col-xs-12">
         <h2>Welcome</h2>
-        <p>Bootstrap CMS is a PHP CMS powered by <a href="http://laravel.com">Laravel 5</a> with <a href="/GrahamCampbell/CMS-Core">Bootstrap CMS</a> and <a href="https://cartalyst.com/manual/sentry">Sentry</a>. Bootstrap CMS was created by, and is maintained by <a href="/GrahamCampbell">Graham Campbell</a>.</p>
+        <p>Bootstrap CMS is a PHP CMS powered by <a href="http://laravel.com">Laravel 5</a> with <a href="/BootstrapCMS/CMS">Bootstrap CMS</a> and <a href="https://cartalyst.com/manual/sentry">Sentry</a>. Bootstrap CMS was created by, and is maintained by <a href="/GrahamCampbell">Graham Campbell</a>.</p>
         <p>
             <a class="btn" href="<?php echo URL::route("pages.show", array("pages" => "about")); ?>">View details &raquo;</a>
         </p>
     </div>
 
     <div class="col-md-4 col-sm-6 col-xs-12">
         <h2>Forking</h2>
-        <p>Feel free to fork this project and use it anywhere, in compliance with the <a href="/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md">license</a>. Before submitting a pull request, please ensure your fork is up to date.</p>
+        <p>Feel free to fork this project and use it anywhere, in compliance with the <a href="/BootstrapCMS/CMS/blob/master/LICENSE">license</a>. Before submitting a pull request, please ensure your fork is up to date.</p>
         <p>
             <a class="btn" href="<?php echo URL::route("pages.show", array("pages" => "about")); ?>">View details &raquo;</a>
         </p>