Merge pull request #22 from cajones/hotfix/bad-merge

reverted scormwarpper to previous version
adaptlearning · May 30, 2014 · d83a655 · d83a655
2 parents 943c118 + cedc761
commit d83a655
Show file tree

Hide file tree

Showing 5 changed files with 540 additions and 430 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+node_modules