diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-10-24 07:52:21 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-10-24 07:52:21 +0000 |
| commit | f7bdfe5098c9a5a3a426344ba1d7dd668212cf7e (patch) | |
| tree | 5a1cb2a90b0a2b5114f6f23712b68724b3e8a7e0 /config/dependency_decisions.yml | |
| parent | 9cd528aa7ac5066570cb50b909951a6c6b723935 (diff) | |
| parent | e16add2267648d3d3ef1d98f9b53f67a29428791 (diff) | |
| download | gitlab-ce-es-module-autosave.tar.gz | |
Merge branch 'master' into 'es-module-autosave'es-module-autosave
# Conflicts:
# app/assets/javascripts/issuable_form.js
# app/assets/javascripts/notes.js
Diffstat (limited to 'config/dependency_decisions.yml')
| -rw-r--r-- | config/dependency_decisions.yml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index db31b01a7d2..3af7f7bd5c0 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -464,3 +464,10 @@ :why: Our own library - https://gitlab.com/gitlab-org/gitlab-svgs :versions: [] :when: 2017-09-19 14:36:32.795496000 Z +- - :license + - pikaday + - MIT + - :who: + :why: + :versions: [] + :when: 2017-10-17 17:46:12.367554000 Z |