| Conflicts: - `yarn.lock`: Upstream touched a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. | ||
|---|---|---|
| .. | ||
| bar_chart_4_bars-fill.svg | ||
| bar_chart_4_bars.svg | ||
| close-fill.svg | ||
| close.svg | ||
| code-fill.svg | ||
| code.svg | ||
| description-fill.svg | ||
| description.svg | ||
| markdown-fill.svg | ||
| markdown.svg | ||
| mood-fill.svg | ||
| mood.svg | ||
| photo_library-fill.svg | ||
| photo_library.svg | ||
| quickreply-fill.svg | ||
| quickreply.svg | ||
| settings-fill.svg | ||
| settings.svg | ||
| share-fill.svg | ||
| share.svg | ||
| share_off-fill.svg | ||
| share_off.svg | ||
| warning-fill.svg | ||
| warning.svg | ||