diff options
author | Michel Engelen <michel@nomorejs.net> | 2019-07-02 14:31:22 +0200 |
---|---|---|
committer | Michel Engelen <michel@nomorejs.net> | 2019-07-02 14:31:22 +0200 |
commit | 83330822d6ee3c59a057adeda35b23ab0021b63a (patch) | |
tree | 9d34414a72b655a3d20acf27724ff827212f7695 /config | |
parent | f02544a9bb24cb89ba3d3fc4163b81da3b34355d (diff) | |
parent | 60797e9effec3fa43bdd1aff261aa92c0329bdc1 (diff) | |
download | gitlab-ce-83330822d6ee3c59a057adeda35b23ab0021b63a.tar.gz |
Merge remote-tracking branch 'origin/issue/55953' into issue/55953
# Conflicts:
# locale/gitlab.pot
# spec/features/discussion_comments/commit_spec.rb
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions