Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
actions	Insert polls in redux stores before statuses so it avoids crashes (#10140)	2019-03-03 23:44:52 +01:00
components	Fix various issues in polls (#10165)	2019-03-05 03:51:18 +01:00
containers	Add polls (#10111)	2019-03-03 22:18:23 +01:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-26 17:04:44 +01:00
middleware
reducers	Add polls (#10111)	2019-03-03 22:18:23 +01:00
selectors
service_worker	Hide CWed content in notifications and fix sensitive images without CWs (#9778)	2019-01-11 07:29:17 +00:00
storage
store	Update dependencies for Node.js (2018-12-31) (#9669)	2018-12-31 18:11:48 +01:00
utils	Add WebP support (#9879)	2019-02-02 12:25:04 +01:00
api.js	Update dependencies for Node.js (2018-12-31) (#9669)	2018-12-31 18:11:48 +01:00
base_polyfills.js
common.js	Improve the public hashtag page (#9831)	2019-01-17 14:06:08 +01:00
compare_id.js
extra_polyfills.js
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
is_mobile.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js