Merge branch 'dev' into merge/sync-prod-code/20240721

daodaoedu · Jul 21, 2024 · 185033c · 185033c
2 parents 8536169 + e673903
commit 185033c
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 0 deletions.
diff --git a/public/email/img_2838_6236_d5c124.png b/public/email/img_2838_6236_d5c124.png
diff --git a/public/email/img_2838_6522_f67599.png b/public/email/img_2838_6522_f67599.png
diff --git a/public/email/img_2838_6548_5c6871.png b/public/email/img_2838_6548_5c6871.png
diff --git a/public/email/img_2838_6586_45e7da.png b/public/email/img_2838_6586_45e7da.png
diff --git a/public/email/img_2850_6901_efe8a8.png b/public/email/img_2850_6901_efe8a8.png
diff --git a/public/email/img_2850_6906_df5340.png b/public/email/img_2850_6906_df5340.png
diff --git a/public/email/img_2850_6909_3cac63.png b/public/email/img_2850_6909_3cac63.png
diff --git a/public/email/img_2850_6912_12ce7d.png b/public/email/img_2850_6912_12ce7d.png
diff --git a/public/email/img_I2838_6191_255_5407_c24b31.png b/public/email/img_I2838_6191_255_5407_c24b31.png
diff --git a/public/email/table_1a1flou_64fd4c.png b/public/email/table_1a1flou_64fd4c.png
diff --git a/public/email/table_1a1flou_98c985.png b/public/email/table_1a1flou_98c985.png
diff --git a/public/email/table__3kiofg_5bedb9.png b/public/email/table__3kiofg_5bedb9.png
diff --git a/public/email/table__3kiofg_c57e3c.png b/public/email/table__3kiofg_c57e3c.png
diff --git a/public/email/table_k6aic7_29c903.png b/public/email/table_k6aic7_29c903.png
diff --git a/public/email/table_k6aic7_f5c74b.png b/public/email/table_k6aic7_f5c74b.png
diff --git a/redux/reducers/index.js b/redux/reducers/index.js
@@ -5,6 +5,7 @@ import theme from './theme';
 import shared from './shared';
 import resource from './resource';
 import group from './group';
+import partners from './partners';
 
 const allReducers = combineReducers({
   search,
@@ -13,6 +14,7 @@ const allReducers = combineReducers({
   shared,
   resource,
   group,
+  partners,
 });
 
 export default allReducers;
diff --git a/redux/sagas/index.js b/redux/sagas/index.js
@@ -1,6 +1,7 @@
 import { all } from 'redux-saga/effects';
 import searchSaga from './searchSaga';
 import userSaga from './user';
+import partnerSaga from './partnersSaga';
 import sharedSaga from './sharedSaga';
 import resourceSaga from './resourceSaga';
 import groupSaga from './groupSaga';
@@ -14,5 +15,6 @@ export default function* rootSaga() {
     sharedSaga(),
     resourceSaga(),
     groupSaga(),
+    partnerSaga(),
   ]);
 }