summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2015-09-11 12:01:48 +0200
committerKristian Nielsen <knielsen@knielsen-hq.org>2015-09-11 12:01:48 +0200
commitdf9b8aee5879fa2b6e47ed02fff4e6fbb45f720f (patch)
tree377cf5b9b7dd2068e6cee37dbc32222d79ddc29d /CREDITS
parent6f302d9f6cb1eafc018d9ca010dc40f15cb19390 (diff)
parent51eaa7fe53eb017ffb3f4dc2f318cb0511b7cd26 (diff)
downloadmariadb-git-df9b8aee5879fa2b6e47ed02fff4e6fbb45f720f.tar.gz
Merge MDEV-8193 into 10.1
Conflicts: sql/rpl_rli.cc
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions