Commit 9aba84f
committed
Merge branch '6.1' into 6.2
# Conflicts:
# wcfsetup/install/files/js/3rdParty/ckeditor/ckeditor5.bundle.js
# wcfsetup/install/files/js/WoltLabSuite/WebComponent.min.js
# wcfsetup/install/files/lib/system/session/SessionHandler.class.php86 files changed
Lines changed: 192 additions & 130 deletions
File tree
- ts/WoltLabSuite/Core/Component/User/RecentActivity
- wcfsetup/install/files
- js
- 3rdParty/ckeditor
- translations
- WoltLabSuite/Core/Component/User/RecentActivity
- lib
- action
- system
- bbcode
- cronjob
- exception
- search
- session
- template
- style
- layout
- ui
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
78 | 82 | | |
79 | 83 | | |
80 | 84 | | |
| |||
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments