Orgad Shaneh 42a7e65890 ChangeScreen: Do not show "Cannot Merge" for WIP changes ...

It is confusing, and has an even more confusing tooltip:
The change cannot be merged due to a path conflict...

Change-Id: I238753fa93166ff95283f283b1c52342229391c1

2018-06-20 10:08:07 +03:00

..

src

ChangeScreen: Do not show "Cannot Merge" for WIP changes

2018-06-20 10:08:07 +03:00

BUILD

Merge branch 'stable-2.14' into stable-2.15

2018-06-14 16:55:29 +09:00