Merge branch 'release/3.0.3'

austintoddj · Jan 9, 2017 · 3a3c046 · 3a3c046
2 parents afaf4b9 + 5964f57
commit 3a3c046
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
     "require": {
         "laravel/framework": "5.3.*",
         "cnvs/easel": "3.0.*",
-        "cnvs/canvas-theme-paper-dark": "*",
+        "cnvs/paper-dark": "*",
         "doctrine/dbal": "^2.5"
     },
     "require-dev": {

diff --git a/license b/license
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Todd Austin
+Copyright (c) Todd Austin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/readme.md b/readme.md
@@ -32,4 +32,4 @@ Detailed changes for each release are documented in the [release notes](https://
 
 ## License
 
-Canvas is open-sourced software licensed under the [MIT license](https://github.com/cnvs/canvas/blob/master/license).
+Canvas is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
diff --git a/routes/web.php b/routes/web.php
@@ -0,0 +1,13 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Web Routes
+|--------------------------------------------------------------------------
+|
+| This file is where you may define all of the routes that are handled
+| by your application. Just tell Laravel the URIs it should respond
+| to using a Closure or controller method. Build something great!
+|
+*/
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@ Detailed changes for each release are documented in the [release notes](https://

		## License

		Canvas is open-sourced software licensed under the [MIT license](https://github.com/cnvs/canvas/blob/master/license).
		Canvas is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).