Glitch-Shrike/app/javascript/mastodon
unarist d8a0ee1956 Fix merge default columns (#3748)
mergeDeep also merges columns, but it should be replaced simply.

So in the new function, first apply mergeDeep except columns, and set default columns if columns unset.
2017-06-14 21:59:52 +02:00
..
actions Save settings when they are changed (#3743) 2017-06-14 18:59:02 +02:00
components fix(status): Content jump due to height changes (#3734) 2017-06-13 20:46:21 +02:00
containers
features Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725) 2017-06-13 03:55:28 +02:00
locales Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725) 2017-06-13 03:55:28 +02:00
middleware
reducers Fix merge default columns (#3748) 2017-06-14 21:59:52 +02:00
selectors
store
.gitkeep
api.js
base_polyfills.js
emoji.js
extra_polyfills.js
is_mobile.js
link_header.js
load_polyfills.js
main.js
performance.js
rtl.js
scroll.js
stream.js
uuid.js