Skip to content

Commit

Permalink
Merge branch 'master' of github.com:h5p/h5p-blanks
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
icc committed Mar 26, 2014
2 parents 833efbd + b1c37d8 commit c24ac30
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Test your users with fill in the blanks tasks(Cloze tests).
(The MIT License)

Copyright (c) 2012-2014 Amendor AS

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:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
Expand Down

0 comments on commit c24ac30

Please sign in to comment.