2. H5P
3. Changes

GitHub: https://github.com/NDLANO/h5p-3d-model, master a month ago

Repository rebased

Original revision: ebdb250e0f29377cb33d322bf98dc4b06fdd3c49
New revision: 2c9ab4d380ab8d9da3233d640b0487291329f957 a month ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master a month ago

Component seems unused. a month ago

Repository rebased

Original revision: 604aa2ad44086d4758dac7a4e4454dd8d8f027a3
New revision: 0536e0351d3cb31d96d25442cb01cefabaf8d23d a month ago

GitHub: https://github.com/otacke/h5p-ar-scavenger, master a month ago

Repository rebased

Original revision: 6a1b9fafb5c73d27d49f78168a1b291c49869dab
New revision: bc411e6cb9d735968a38183e18700df369e0caa5 a month ago

GitHub: https://github.com/otacke/h5p-kewar-code, master a month ago

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)

a month ago

GitHub: https://github.com/otacke/h5p-agamotto, master a month ago

Repository rebased

Original revision: ecd9c75dbf2757abadf6306c6e480c16a2c61fb0
New revision: 4b2a8f9144620529b01631909d1dc29cdd175ab4 a month ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, master a month ago

Repository rebased

Original revision: eebe7d9030274cc5a84c8a789b5d16ea44c46273
New revision: 18a0250f93bb72792e83d263f537efc946a605ce a month ago

GitHub: https://github.com/NDLANO/h5p-ndla-timeline, master a month ago

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)

a month ago

GitHub: https://github.com/otacke/h5p-agamotto, master a month ago

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)

a month ago

GitHub: https://github.com/otacke/h5p-agamotto, master a month ago

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)

a month ago

GitHub: https://github.com/otacke/h5p-agamotto, master a month ago