]> _ Git - fluidbook-html5.git/commit
projects / fluidbook-html5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 533963c 086b959)
Merge branch 'master' into scorm2004
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 25 May 2018 15:22:46 +0000 (17:22 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 25 May 2018 15:22:46 +0000 (17:22 +0200)
commita99ef48cdd76c9cbb847b6a53a034549a264ddb1
tree9e23e6574261ed8aea00e5fd093827123192fa09tree | snapshot
parent533963cc751880f2df4b3979b4ecba911f8e9b27commit | diff
parent086b9591e2a76b438d01eeb5408f5e304d025225commit | diff
Merge branch 'master' into scorm2004

# Conflicts:
# js/libs/scorm/scorm.js
js/libs/scorm/scorm.js diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.