Skip to content

Commit 8539b18

Browse files
committed
Merge branch 'develop'
2 parents 87be348 + b134076 commit 8539b18

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

LICENSE.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1-
# GPL 3
1+
#The MIT License (MIT)
2+
3+
**Copyright (c) [2016] [Wangaz. GbR]**
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"name": "wangaz/laravel-semantic-ui-css",
33
"description": "Semantic UI Implementation for Laravel",
44
"keywords": ["css", "laravel", "semantic ui"],
5-
"license": "GPL-3.0",
6-
"version": "1.0.0",
5+
"license": "MIT",
6+
"version": "1.0.1",
77
"type": "library",
88
"provide": {
99
"semantic/ui-css": "2.1.8",
10-
"jquery/jquery": "2.2.0"
10+
"jquery/jquery": "2.2.0"
1111
}
1212
}

0 commit comments

Comments
 (0)