2. H5P
3. Changes

The “language/.en.json” file was changed. 5 months ago

English English 86 characters edited Current translation Translated 5 months ago

English English 24 characters edited Current translation Translated 5 months ago

English English 62 characters edited Current translation Translated 5 months ago

English English 9 characters edited Current translation Translated 5 months ago

Repository rebased

Original revision: 996ff258d0764dc7acec76b7fd86ac2e7a296041
New revision: 2098cb9ba950887fd894c189bc237e82eceb625e 5 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 5 months ago

Repository rebased

Original revision: 33a53c80c347f7d82a3ec36bd1d96b19015b8106
New revision: 996ff258d0764dc7acec76b7fd86ac2e7a296041 5 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 5 months ago

Repository rebased

Original revision: ddb7d078d2a256574016bf421307879c19a1a3d8
New revision: 33a53c80c347f7d82a3ec36bd1d96b19015b8106 5 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 5 months ago

Repository rebased

Original revision: 1c0babab6941c68c4184adfeb0eaba48d13fc850
New revision: ddb7d078d2a256574016bf421307879c19a1a3d8 5 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 5 months ago

Repository outdated. 5 months 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)

5 months ago

GitHub: https://github.com/otacke/h5p-agamotto, master 5 months 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)

5 months ago

GitHub: https://github.com/otacke/h5p-agamotto, master 5 months 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)

5 months ago

GitHub: https://github.com/otacke/h5p-agamotto, master 5 months ago