mastodon/app
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
..
controllers Fix account delete form not accepting password, update suspended (#3745) 2017-06-14 20:30:12 +02:00
helpers
javascript Fix merge default columns (#3748) 2017-06-14 21:59:52 +02:00
lib
mailers
models Account deletion (#3728) 2017-06-14 18:01:27 +02:00
policies
presenters
services Fix account delete form not accepting password, update suspended (#3745) 2017-06-14 20:30:12 +02:00
validators
views Account deletion (#3728) 2017-06-14 18:01:27 +02:00
workers Batched remove status service (#3735) 2017-06-14 18:01:35 +02:00