summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-08-07 08:37:13 +0000
committerazul <azul@riseup.net>2017-08-07 08:37:13 +0000
commit66b05aa9dc702096d5ce2b75abe7619f780ff8ec (patch)
treed6442dbd54d2cf6224714ce2b96643f548148f09 /doc
parent38ce3a14652aca9b3b8d8ad42f9968cfbcc44478 (diff)
parent0a161e88143d28349c49805ea7cc83c5106e075a (diff)
Merge branch 'fix/token-conflict' into 'master'
prevent token conflicts Closes #8792 See merge request !42
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions