User avatar otacke

Changes pushed

  1. H5P
  2. h5p-editor-branching-scenario
Changes pushed 3 years ago
User avatar otacke

Changes pushed

  1. H5P
  2. h5p-dictation
Changes pushed 3 years ago
User avatar otacke

Changes pushed

  1. H5P
  2. h5p-audio-recorder
Changes pushed 3 years ago
User avatar otacke

Changes pushed

  1. H5P
  2. h5p-advanced-text
Changes pushed 3 years ago
User avatar otacke

Resource updated

  1. H5P
  2. h5p-crossword
  3. Greek
The “language/el.json” file was changed. 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-crossword
Repository rebased 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-image
Repository rebased 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-arithmetic-quiz
Repository rebased 3 years ago
User avatar otacke

Repository rebase failed

  1. H5P
  2. h5p-drag-question
 
First, rewinding head to replay your work on top of it...
Applying: Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk.
Using index info to reconstruct a base tree...
M	language/sr.json
Falling back to patching base and 3-way merge...
Auto-merging language/sr.json
CONFLICT (content): Merge conflict in language/sr.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk.

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-open-ended-question
Repository rebased 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-greeting-card
Repository rebased 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-dictation
Repository rebased 3 years ago
User avatar otacke

Resource updated

  1. H5P
  2. h5p-blanks
  3. Turkish
The “language/tr.json” file was changed. 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-blanks
Repository rebased 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-agamotto
Repository rebased 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-essay
Repository rebased 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-video
Repository rebased 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-simple-multiple-choice
Repository rebased 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-speak-the-words
Repository rebased 3 years ago
User avatar otacke

Repository rebased

  1. H5P
  2. h5p-link
Repository rebased 3 years ago

Search