master : lp:unity : Git : Code : Unity

Get this branch:: git clone -b master https://git.launchpad.net/unity

Members of Unity Team can upload to this branch. Log in for directions.

Branch merges

2 branches proposed for merging into this one.

Branch information

Name:: master

Repository:: lp:unity

Recent commits

e1fec42... by Marco Trevisan (Treviño) on 2019-04-10

debian/changelog: Fix git automatic merge issue

cb7ae65... by CI Train Bot Account on 2019-03-04

Releasing 7.5.0+19.04.20190304-0ubuntu1

Merged branch unity:include-fixes

0dbd832... by CI Train Bot Account on 2019-02-17

Releasing 7.5.0+19.04.20190217-0ubuntu1

bada2f8... by Andrea Azzarone on 2019-02-17

locksreen: cancel authentication if externally unlocked

The lockscreen can be externellay unlocked. This happens e.g. when
you unlock the session from LightDM or from the CLI. We need to
cancel the authentication in order to ensure that the next one does
not fail.

Fixes: https://bugs.launchpad.net/unity/+bug/1733557 (LP: #1733557)

Approved by: Marco Trevisan (Treviño)

Merged branch ~azzar1/unity:fix-1733557

b558215... by Andrea Azzarone on 2019-02-13

locksreen: cancel authentication if externally unlocked

The lockscreen can be externellay unlocked. This happens e.g. when
you unlock the session from LightDM or from the CLI. We need to
cancel the authentication in order to ensure that the next one does
not fail.

Fixes: https://bugs.launchpad.net/unity/+bug/1733557

7d40a53... by CI Train Bot Account on 2019-02-08