Please split this into 2 parts:
* things that can go into trunk directly (so basically everything apart of CardFilterGrid and CardCarousel), and MP against trunk - take lp:~aacid/unity8/new-scopes-carousel-as-grid with it; * CardCarousel and CardFilterGrid changes, MP against lp:~unity-team/unity8/new-scopes-clean-to-trunk
Also, please maintain doc style (/*!, not ///, and \brief is needed, too) and use sentence case in docs (first letter in caps).
And there's conflicts.
« Back to merge proposal
Please split this into 2 parts:
* things that can go into trunk directly (so basically everything apart of CardFilterGrid and CardCarousel), and MP against trunk - take lp:~aacid/unity8/new-scopes-carousel-as-grid with it;
* CardCarousel and CardFilterGrid changes, MP against lp:~unity-team/unity8/new-scopes-clean-to-trunk
Also, please maintain doc style (/*!, not ///, and \brief is needed, too) and use sentence case in docs (first letter in caps).
And there's conflicts.