Skip to content

Commit

Permalink
Updating license
Browse files Browse the repository at this point in the history
  • Loading branch information
kristoferjoseph committed Dec 27, 2013
1 parent b0829ce commit b5a1c9e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.
3 changes: 3 additions & 0 deletions Gruntfile.js
Expand Up @@ -17,6 +17,9 @@ module.exports = function(grunt) {
}
},
cssmin: {
options: {
banner: grunt.file.read('LICENSE')
},
concat: {
files: {
'css/index.css': ['vendor/css/normalize.css', 'src/style.css', 'src/flexboxgrid.css']
Expand Down
29 changes: 10 additions & 19 deletions LICENSE
@@ -1,22 +1,13 @@
Copyright (c) 2013 Kristofer Joseph
Copyright 2013 Kristofer Joseph

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
http://www.apache.org/licenses/LICENSE-2.0

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

0 comments on commit b5a1c9e

Please sign in to comment.