Merge tag 'v2.9.3' into instance_only_statuses

2019-08-10 09:20:44 +02:00
parent 405d6a71c8 06f906acac
commit fbaaf24be8
98 changed files with 852 additions and 270 deletions
--- a/app/javascript/mastodon/features/compose/containers/search_results_container.js
+++ b/app/javascript/mastodon/features/compose/containers/search_results_container.js
@ -5,6 +5,7 @@ import { fetchSuggestions, dismissSuggestion } from '../../../actions/suggestion
 const mapStateToProps = state => ({
  results: state.getIn(['search', 'results']),
  suggestions: state.getIn(['suggestions', 'items']),
+  searchTerm: state.getIn(['search', 'searchTerm']),
 });

 const mapDispatchToProps = dispatch => ({