Skip to content

Commit

Permalink
Merge pull request #681 from VeggieMeat/master
Browse files Browse the repository at this point in the history
Update license in composer.json to match project
  • Loading branch information
ruflin committed Sep 17, 2014
2 parents 686fbdb + aa09ba4 commit f235765
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions changes.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
CHANGES

2014-09-16
- Update license in composer.json to match project #681

2014-09-08
- Delete execution permission from non-executable files #677

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"keywords": ["search","client"],
"homepage": "http://elastica.io/",
"type": "library",
"license": "Apache 2.0",
"license": "MIT",
"authors": [
{
"name": "Nicolas Ruflin",
Expand Down

0 comments on commit f235765

Please sign in to comment.