tree 9f59e84a0dc994de771876e10dbe35872b00a601
parent 4e4e0f9731f50cb862a7738288b14d322ba5617a
parent f2ffe80abb77223f3f8921f3f068b0e32d40f798
author Paladox <thomasmulhall410@yahoo.com> 1552063709 +0000
committer Paladox none <thomasmulhall410@yahoo.com> 1552067197 +0000

Merge branch 'stable-2.16'

* stable-2.16:
  Fix mobile display on gr-create-change-dialog
  LogThreshold: Allow the annotation to be inherited
  Do not show "Patch file" if change does not have a parent
  Fix support to use "Default Base For Merges" preference
  Re use gr-diff-preferences inside gr-settings-view
  Fix avatars not showing correctly

Change-Id: I26b8326304343bbe665b3ddcac401dc7b355a2bc