about summary refs log tree commit diff
path: root/app/assets/javascripts/components/features/notifications
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-13 19:36:41 +0200
committerGitHub <noreply@github.com>2017-04-13 19:36:41 +0200
commitac54da939413836733e30627def9ca645d3735d4 (patch)
treec6f13821b0fe13fd9cb44f8dc30f329b9df286c4 /app/assets/javascripts/components/features/notifications
parent043862f4118a9ee5e6708ff9c144fa9e668ee06d (diff)
Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699)
Fix username styling regression introduced in #1063
Fix report screen background regression introduced in #1415
Diffstat (limited to 'app/assets/javascripts/components/features/notifications')
-rw-r--r--app/assets/javascripts/components/features/notifications/components/column_settings.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/notifications/components/column_settings.jsx b/app/assets/javascripts/components/features/notifications/components/column_settings.jsx
index 9dfc8ba8b..2edf98292 100644
--- a/app/assets/javascripts/components/features/notifications/components/column_settings.jsx
+++ b/app/assets/javascripts/components/features/notifications/components/column_settings.jsx
@@ -27,7 +27,7 @@ const ColumnSettings = React.createClass({
 
   propTypes: {
     settings: ImmutablePropTypes.map.isRequired,
-    intl: ImmutablePropTypes.object.isRequired,
+    intl: React.PropTypes.object.isRequired,
     onChange: React.PropTypes.func.isRequired,
     onSave: React.PropTypes.func.isRequired,
   },