Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.env
#	src/api/index.ts

src/api/index.ts

@@ -7,3 +7,4 @@ export * from './manage'
 export * from './course'
 export * from './brand'
 export * from './home'
+export * from './brand'