diff options
author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-06-01 10:31:33 +0200 |
---|---|---|
committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-06-01 10:31:33 +0200 |
commit | 00b00f1edee71d236b0cd5b796bb68f15142911f (patch) | |
tree | 471ef31c0c455abe44f04dcd7d2ba84e87f22be1 /app/assets/javascripts/task_list.js | |
parent | f4aa01053ed39a265ddfd9ee6e9618bd3406e59d (diff) | |
parent | dd0f8b8ccc3b5f61e31703f7391a919b702934a5 (diff) | |
download | gitlab-ce-00b00f1edee71d236b0cd5b796bb68f15142911f.tar.gz |
Merge branch 'master' into zj-realtime-env-list
Diffstat (limited to 'app/assets/javascripts/task_list.js')
-rw-r--r-- | app/assets/javascripts/task_list.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/task_list.js b/app/assets/javascripts/task_list.js index 3392cb9da29..419c458ff34 100644 --- a/app/assets/javascripts/task_list.js +++ b/app/assets/javascripts/task_list.js @@ -1,6 +1,6 @@ /* global Flash */ -import 'vendor/task_list'; +import 'deckar01-task_list'; class TaskList { constructor(options = {}) { |