Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/structure-code-in-folders' into feature/switch-…
…to-pascal-case # Conflicts: # src/ts/UIManager.ts # src/ts/components/seekbar/SeekBar.ts # src/ts/components/seekbar/seekbarcontroller.ts # src/ts/components/settings/subtitlesettings/SubtitleSettingSelectBox.ts # src/ts/components/settings/subtitlesettings/SubtitleSettingsResetButton.ts # src/ts/components/settings/subtitlesettings/subtitlesettingsmanager.ts # src/ts/utils/SeekBarController.ts # src/ts/utils/SubtitleSettingsManager.ts # src/ts/utils/seekbarcontroller.ts # src/ts/utils/subtitlesettingsmanager.ts
- Loading branch information