forked from treehouse/mastodon
5e11f3a6e1
Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes. |
||
---|---|---|
.. | ||
action_bar.js | ||
autosuggest_account.js | ||
character_counter.js | ||
compose_form.js | ||
emoji_picker_dropdown.js | ||
navigation_bar.js | ||
poll_button.js | ||
poll_form.js | ||
privacy_dropdown.js | ||
reply_indicator.js | ||
search.js | ||
search_results.js | ||
text_icon_button.js | ||
upload.js | ||
upload_button.js | ||
upload_form.js | ||
upload_progress.js | ||
warning.js |