ddd875ad99
Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder |
||
---|---|---|
.. | ||
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 |