tree f4c03f2c98317d5c6f57f7d42dd784dd84dc62a7
parent f4789f675a41be371535b5e65410d572a86d643c
parent a8b3d626a732aa3e2d668fa0897b67699e92fdf8
author David Ostrovsky <david@ostrovsky.org> 1549353476 +0100
committer David Ostrovsky <david@ostrovsky.org> 1549353488 +0100

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  GoogleOAuthService: Stop using deprecated Google+ userinfo endpoint

Change-Id: Ief5c44a6194e44cf450ded2dc85a5ccb60d17975