diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-08-10 12:13:45 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-08-10 12:13:45 +0000 |
| commit | 63cf88810d35cccd66d27c6eb5e1a5c6157e53d3 (patch) | |
| tree | ac8a4bd194bcdd0fb62570634a132a47c645e844 /app/assets/javascripts/user_callout.js | |
| parent | f8f699ab976801af80221994fbfe148f39070d8a (diff) | |
| parent | 52646106754a4eae02c6ae0c988508981c4f8e39 (diff) | |
| download | gitlab-ce-63cf88810d35cccd66d27c6eb5e1a5c6157e53d3.tar.gz | |
Merge branch 'master' into 'port-i18n-for-mirrors-instructions'
# Conflicts:
# app/views/projects/mirrors/_instructions.html.haml
Diffstat (limited to 'app/assets/javascripts/user_callout.js')
0 files changed, 0 insertions, 0 deletions