Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Merge BBB 2.5 into 2.6 #16555

Merged
merged 9 commits into from
Jan 25, 2023
Merged

chore: Merge BBB 2.5 into 2.6 #16555

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2bf7c8d
Apply translations in fr
transifex-integration[bot] Jan 17, 2023
d9cc7e9
Merge pull request #16486 from bigbluebutton/translations_bigbluebutt…
antobinary Jan 17, 2023
a36dbb1
removing dependencies that aren't necessary in backport
zhem0004 Jan 18, 2023
facb648
Merge pull request #16505 from zhem0004/removeUnnecessaryToBackport
antobinary Jan 20, 2023
8ffa975
upgrade databinding to 5.2.4
zhem0004 Jan 20, 2023
be85362
Merge pull request #16522 from zhem0004/databindingUpgrade
gustavotrott Jan 20, 2023
605af26
specify version of snakeYML to upgrade
zhem0004 Jan 20, 2023
3daecea
Merge pull request #16526 from zhem0004/snakeYMLupgrade
antobinary Jan 25, 2023
b66d097
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutt…
antobinary Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bigbluebutton-web/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ dependencies {
implementation "org.grails:grails-plugin-url-mappings"
implementation "org.grails:grails-plugin-interceptors"
implementation 'org.grails.plugins:external-config:1.2.2'
//implementation "org.grails.plugins:cache"
implementation "org.yaml:snakeyaml:1.31"
implementation "org.grails.plugins:views-json:2.1.1"
implementation "org.grails.plugins:cache"
implementation "org.apache.xmlbeans:xmlbeans:5.0.3"
Expand Down