Anton 0780ed17b0 Fix conflicts		2023-08-21 11:34:34 +02:00
..
assets	Fix conflicts	2023-08-21 11:34:34 +02:00
components
controllers	Merge branch 'develop' into features/september-release	2023-08-21 11:25:27 +02:00
datatables	Fix rendering team table [SCI-9039] (#5967)	2023-08-11 10:52:47 +02:00
helpers	Fix shared task view issues [SCI-9076]	2023-08-21 09:15:46 +02:00
javascript	Merge branch 'develop' into features/september-release	2023-08-21 11:25:27 +02:00
jobs	Merge branch 'develop' into features/september-release	2023-08-21 11:25:27 +02:00
mailers	Drop system notifications tables and remove logic	2023-07-25 14:48:03 +02:00
middlewares
models	Merge branch 'develop' into features/september-release	2023-08-21 11:25:27 +02:00
permissions	Merge pull request #5917 from scinote-eln/features/august-release	2023-08-04 14:01:44 +02:00
serializers	Merge branch 'develop' into features/september-release	2023-08-21 11:25:27 +02:00
services	Merge branch 'develop' into features/september-release	2023-08-21 11:25:27 +02:00
utilities	Fix fetching of WOPI discovery document [SCI-8889] (#5803)	2023-07-18 15:25:04 +02:00
views	Merge branch 'develop' into features/september-release	2023-08-21 11:25:27 +02:00