cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-13 03:13:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/master' into v3

Browse Source
This commit is contained in:
cv
2024-01-12 10:05:10 +01:00
parent 5b7045e6a5 71092afc02
commit 229fff05a4
26 changed files with 2130 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/classes/data-provider/__test__/DataProvider.test.ts
-1
View File
@@ -97,7 +97,6 @@ describe('safeMerge', () => {
language: 'pt',
});
});
it('merges the osc key', () => {
const newData = {
osc: {