Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.jsx | ||
Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.jsx | ||