pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflic resolved

Browse Source
This commit is contained in:
or-else
2021-07-07 16:39:03 -07:00
parent e30868c072 d1ea1d7658
commit 4975084eef
2 changed files with 1041 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+1036 -890
View File
File diff suppressed because it is too large Load Diff
src/index.js
+3 -1
View File
@@ -29,8 +29,10 @@ const messages =
allMessages.en; allMessages.en;
ReactDOM.render( ReactDOM.render(
<React.StrictMode>
<IntlProvider locale={language} messages={messages} textComponent={React.Fragment}> <IntlProvider locale={language} messages={messages} textComponent={React.Fragment}>
<TinodeWeb /> <TinodeWeb />
</IntlProvider>, </IntlProvider>
</React.StrictMode>,
document.getElementById('mountPoint') document.getElementById('mountPoint')
); );