diff options
| author | Peter Kozak <spag@golwen.net> | 2013-03-11 02:43:51 -0400 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-03-11 02:43:51 -0400 |
| commit | 436368d7719a9447c5c09dc6f8b24a623b48f3b6 (patch) | |
| tree | c288f4c91d7937303f5f2553c60aa16062bcab73 /app/assets/javascripts/application.js | |
| parent | 0c5c2bc651bc701117d376a68905cb7d2f913449 (diff) | |
| parent | beb9e66a5b4e2744435f2c1f301828b68a58c96a (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
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 . |