Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes
# Conflicts: # backend/src/controllers/learning-objects.ts
This commit is contained in:
commit
01b40992e2
15 changed files with 35 additions and 32 deletions
|
@ -1,4 +1,4 @@
|
|||
import { Language } from "../util/language";
|
||||
import { Language } from '../util/language';
|
||||
|
||||
export interface Transition {
|
||||
default: boolean;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue