Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
poef committed Jun 25, 2014
2 parents d1a6d60 + 5adb741 commit 293c449
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Ariadne Component Library: All Components",
"keywords": ["component","components"],
"homepage": "https://github.com/Ariadne-CMS/arc/wiki",
"license": "GPL",
"license": "MIT",
"authors": [
{
"name": "Auke van Slooten",
Expand Down

0 comments on commit 293c449

Please # to comment.