diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-19 06:27:18 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-19 06:27:18 -0700 |
| commit | 1b530e4680b09391d7f99e91f1b0b1eb6b2069fc (patch) | |
| tree | 9beee9ad047c5efa41dae7f64a0195b304770b61 /themes/night_wind/views | |
| parent | 9a6a404a3239c964528b501d3c187ead84b1f7a0 (diff) | |
| parent | b2d0b3ebbb1764593e387a2e07e0d4e67f4f5474 (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/user/views/admin_users.html.php
Diffstat (limited to 'themes/night_wind/views')
| -rw-r--r-- | themes/night_wind/views/page.html.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php index c8b08129..f5c6b0df 100644 --- a/themes/night_wind/views/page.html.php +++ b/themes/night_wind/views/page.html.php @@ -56,7 +56,6 @@ </script> <?= $theme->script("gallery.ajax.js") ?> <?= $theme->script("gallery.dialog.js") ?> - <?= $theme->script("gallery.form.js") ?> <?= $theme->script("superfish/js/superfish.js") ?> <?= $theme->script("jquery.localscroll.js") ?> <?= $theme->script("ui.init.js") ?> |