tree 9caeeba18b74c9d89cf45ec48f0bf62e86b5270c
parent 545727174c89cfa829f01cf19c86ed106e4cd6ab
parent c6e7916b6b33c1867e345da4030a864830c743a5
author Paladox <thomasmulhall410@yahoo.com> 1554495972 +0100
committer Paladox <thomasmulhall410@yahoo.com> 1554495993 +0100

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix Quota rest rate limiter support

Change-Id: I802af8a12ac0128e04e75b5aa2e575a1d3f975d6