diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-09-26 10:31:34 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-09-26 10:31:34 +0200 |
| commit | f8f0d4478aed4167d07ab35192117436fa98ef17 (patch) | |
| tree | a90e8f2ec5d85a1aaa5f6fc3324597e59cc2e033 /app | |
| parent | 87cf5b7055451a387c64bd488dacf2bc03917913 (diff) | |
| parent | 1be7c25dce8e18b60e048f123314fc20605b2557 (diff) | |
| download | gitlab-ce-f8f0d4478aed4167d07ab35192117436fa98ef17.tar.gz | |
Merge pull request #7860 from MarkPochert/patch-1
Update application.js.coffee
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 86158d39ff1..a3da875b90a 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -15,8 +15,8 @@ #= require jquery.atwho #= require jquery.scrollTo #= require jquery.blockUI -#= require turbolinks #= require jquery.turbolinks +#= require turbolinks #= require bootstrap #= require select2 #= require raphael |