tree 894f384dcd97e51029eb3780becbddd8c3014ea5
parent 4b4712c046171091ab539fe90956bb13678a4c2f
parent 1ad849274e5aba54486d73700f32470b505c11a8
author Paladox <thomasmulhall410@yahoo.com> 1552228809 +0000
committer Paladox <thomasmulhall410@yahoo.com> 1552228809 +0000

Merge branch 'stable-2.16'

* stable-2.16:
  Fix import for gr-diff-preferences

Change-Id: I8d8cad2a96582f8b9c356efece4dfa3cc6a67ddd