diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-04-03 08:49:34 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-04-03 09:51:03 +0200 |
| commit | fcbebcb6aa7d9c3251e5766bb232765181c96b5e (patch) | |
| tree | 33c791a1b164f5c6ab3ed2160ab27b8216bf6152 /app | |
| parent | 51bc2c0d7f1e0a200ff43dcc1bf0f7a9a1bb27e6 (diff) | |
| download | gitlab-ce-fcbebcb6aa7d9c3251e5766bb232765181c96b5e.tar.gz | |
Do not require modernizr.
Conflicts:
app/assets/javascripts/main.js.coffee
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f69b750bb69..bc65b505265 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -18,7 +18,6 @@ //= require turbolinks //= require jquery.turbolinks //= require bootstrap -//= require modernizr //= require select2 //= require raphael //= require g.raphael-min |