unarist 167ba4c5f7 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	Fix local fonts and change font-face values (#2877)	2017-05-07 15:23:06 +02:00
images	Replace onboarding elephant with friendlier graphic, shorter animation (#3337)	2017-05-27 00:53:25 +02:00
mastodon	Fix merge default columns (#3748)	2017-06-14 21:59:52 +02:00
packs	Remove comments for eslint-disable (#3691)	2017-06-11 10:42:42 +02:00
styles	Account deletion (#3728)	2017-06-14 18:01:27 +02:00