diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-25 10:27:27 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-25 10:27:27 +0100 |
| commit | df6e17e48995f25e72509986f30700d778b179b6 (patch) | |
| tree | f432c24b8e4ad81009188650dabfd99194883265 /app/assets/javascripts/application.js | |
| parent | 11f186a118285fbc87a536af26730780a9ad01f5 (diff) | |
| parent | cce94a74aa5c9691f9b37cd9be5a6831f8063812 (diff) | |
Merge branch 'develop'5.1.2
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 c6f4107..68a6e22 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,4 +13,5 @@ //= require jquery //= require jquery-ui //= require jquery_ujs +//= require private_pub //= require_tree . |