diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-08-16 16:59:19 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-08-16 16:59:19 -0600 |
| commit | 1d3aa59f99a72f613b84286eef948dfbad20925e (patch) | |
| tree | 0061000ff2226f3bc4e88ce8133a65403de9f37e /app/assets/javascripts/application.js | |
| parent | 1e7cbe0b05ddd9c72987730323e63d612d429ab9 (diff) | |
| parent | 76aa85cc8023e1a8176f0b783a52154f98a5be8f (diff) | |
| download | gitlab-ce-1d3aa59f99a72f613b84286eef948dfbad20925e.tar.gz | |
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'app/assets/javascripts/application.js')
| -rw-r--r-- | app/assets/javascripts/application.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index cc1042c92b8..4b8e687f3d4 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -41,6 +41,7 @@ /*= require date.format */ /*= require_directory ./behaviors */ /*= require_directory ./blob */ +/*= require_directory ./templates */ /*= require_directory ./commit */ /*= require_directory ./extensions */ /*= require_directory ./lib/utils */ |