2ca965c704
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss |
||
---|---|---|
.. | ||
assets | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates/haml/scaffold |
2ca965c704
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss |
||
---|---|---|
.. | ||
assets | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates/haml/scaffold |