Merge branch 'master' into develop · adaptlearning/adapt-contrib-mcq@509f93a · GitHub

Commit

Merge branch 'master' into develop

Browse files

* master:
  Change bower.json displayName case
  Increment version number
  Bower displayName value more descriptive
  Change karma version
  JSON schema

Loading branch information

darylhedley committed May 28, 2014

2 parents 1016ee0 + e64fd17 commit 509f93a