[Merge] ~3v1n0/unity:gnome-file-manager-changes into unity:master

[Dmitry Shachnev]

Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index 15b5358..3121fd8 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,17 @@
> +<<<<<<< debian/changelog
> +=======

You have a conflict here.

> +unity (7.6.0) UNRELEASED; urgency=medium
> +
> +  * Added transparent dash border
> +  * Replaced launcher bfb with Ubuntu Unity logo
> +  * Removed broken app info and ratings from dash
> +  * Simplified app preview in dash
> +  * Fixed the 'Empty Trash' button in the launcher
> +  * Fixed the standalone testing Unity7 launcher
> +
> + -- Rudra Saraswat <rs2009 at ubuntu.com>  Fri, 29 Apr 2022 15:28:29 +0530
> +
> +>>>>>>> debian/changelog
>  unity (7.5.1+22.10.20220818-0ubuntu1) kinetic; urgency=medium
>  
>    [ Alberts Muktupāvels ]


-- 
https://code.launchpad.net/~3v1n0/unity/+git/unity/+merge/429779
Your team Unity Team is requested to review the proposed merge of ~3v1n0/unity:gnome-file-manager-changes into unity:master.