Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
|
||
|---|---|---|
| .. | ||
| fonts | ||
| glitch | ||
| images | ||
| mastodon | ||
| packs | ||
| styles | ||
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
|
||
|---|---|---|
| .. | ||
| fonts | ||
| glitch | ||
| images | ||
| mastodon | ||
| packs | ||
| styles | ||