2. H5P
3. h5p-portfolio
4. Changes

warning: skipped previously applied commit 36c0e7f
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging src/scripts/app.js
CONFLICT (content): Merge conflict in src/scripts/app.js
error: could not apply 5d957c4... Fix fullscreen in preview
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 5d957c4... Fix fullscreen in preview
 (1)

a year ago

warning: skipped previously applied commit 36c0e7f
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging src/scripts/app.js
CONFLICT (content): Merge conflict in src/scripts/app.js
error: could not apply 5d957c4... Fix fullscreen in preview
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 5d957c4... Fix fullscreen in preview
 (1)

a year ago

The component was automatically locked because of an alert. a year ago

Could not merge the repository. a year ago

warning: skipped previously applied commit 36c0e7f
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging src/scripts/app.js
CONFLICT (content): Merge conflict in src/scripts/app.js
error: could not apply 5d957c4... Fix fullscreen in preview
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 5d957c4... Fix fullscreen in preview
 (1)

a year ago

GitHub: https://github.com/otacke/h5p-portfolio, master a year ago

Repository rebased

Original revision: 82463eb70db650e45ba5c6069f9eeeed2f25d95d
New revision: 36c0e7f843a96014870c9fec6e2898b67b80ee73 a year ago

GitHub: https://github.com/otacke/h5p-portfolio, master a year ago

Repository rebased

Original revision: 8b9e8478bf28a7fa127d42c7f56a4d6f0f5eff4b
New revision: 82463eb70db650e45ba5c6069f9eeeed2f25d95d a year ago

GitHub: https://github.com/otacke/h5p-portfolio, master a year ago

Repository rebased

Original revision: ae612800cca375965c25e360baafe82b36914f21
New revision: 8b9e8478bf28a7fa127d42c7f56a4d6f0f5eff4b a year ago

GitHub: https://github.com/otacke/h5p-portfolio, master a year ago

Repository rebased

Original revision: e2285ca14de1489b1aaeca958a19d631ee858b56
New revision: ae612800cca375965c25e360baafe82b36914f21 a year ago

GitHub: https://github.com/otacke/h5p-portfolio, master a year ago

Repository rebased

Original revision: 6dc0612d4b72d0904ebf8284e0ea08254f02e95d
New revision: e2285ca14de1489b1aaeca958a19d631ee858b56 a year ago

GitHub: https://github.com/otacke/h5p-portfolio, master a year ago

Repository rebased

Original revision: bf3b2ab1da4e879e2e9b7900c113eaa10bd1e163
New revision: 6dc0612d4b72d0904ebf8284e0ea08254f02e95d a year ago

GitHub: https://github.com/otacke/h5p-portfolio, master a year ago

Repository rebased

Original revision: 10ec4abafb6efffe7a2b19154d6a3fdc315032a5
New revision: bf3b2ab1da4e879e2e9b7900c113eaa10bd1e163 a year ago

GitHub: https://github.com/otacke/h5p-portfolio, master a year ago