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
..
fonts
images
mastodon	Fix merge default columns (#3748)	2017-06-14 21:59:52 +02:00
packs
styles	Account deletion (#3728)	2017-06-14 18:01:27 +02:00