mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-23 07:14:10 +00:00
d8a0ee1956
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. |
||
---|---|---|
.. | ||
controllers | ||
helpers | ||
javascript | ||
lib | ||
mailers | ||
models | ||
policies | ||
presenters | ||
services | ||
validators | ||
views | ||
workers |